mirror of https://github.com/BOINC/boinc.git
*** empty log message ***
svn path=/trunk/boinc/; revision=5806
This commit is contained in:
parent
d23dca8530
commit
92de5a571a
|
@ -142,15 +142,16 @@ wxInt32 CNetworkConnectionThread::SetNewComputerPassword( const wxChar* szPasswo
|
||||||
|
|
||||||
void CNetworkConnectionThread::SetStateError() {
|
void CNetworkConnectionThread::SetStateError() {
|
||||||
CMainFrame* pFrame = wxGetApp().GetFrame();
|
CMainFrame* pFrame = wxGetApp().GetFrame();
|
||||||
wxASSERT(wxDynamicCast(pFrame, CMainFrame));
|
|
||||||
|
|
||||||
m_bConnected = false;
|
if (wxDynamicCast(pFrame, CMainFrame)) {
|
||||||
m_bReconnecting = false;
|
m_bConnected = false;
|
||||||
m_bReconnectOnError = false;
|
m_bReconnecting = false;
|
||||||
|
m_bReconnectOnError = false;
|
||||||
|
|
||||||
m_bConnectEvent = false;
|
m_bConnectEvent = false;
|
||||||
|
|
||||||
pFrame->FireConnectError();
|
pFrame->FireConnectError();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@ -164,19 +165,20 @@ void CNetworkConnectionThread::SetStateReconnecting() {
|
||||||
|
|
||||||
void CNetworkConnectionThread::SetStateSuccess( std::string& strComputer, std::string& strComputerPassword ) {
|
void CNetworkConnectionThread::SetStateSuccess( std::string& strComputer, std::string& strComputerPassword ) {
|
||||||
CMainFrame* pFrame = wxGetApp().GetFrame();
|
CMainFrame* pFrame = wxGetApp().GetFrame();
|
||||||
wxASSERT(wxDynamicCast(pFrame, CMainFrame));
|
|
||||||
|
|
||||||
m_bConnected = true;
|
if (wxDynamicCast(pFrame, CMainFrame)) {
|
||||||
m_bReconnecting = false;
|
m_bConnected = true;
|
||||||
m_bReconnectOnError = true;
|
m_bReconnecting = false;
|
||||||
m_strConnectedComputerName = strComputer.c_str();
|
m_bReconnectOnError = true;
|
||||||
m_strConnectedComputerPassword = strComputerPassword.c_str();
|
m_strConnectedComputerName = strComputer.c_str();
|
||||||
m_strNewComputerName = wxEmptyString;
|
m_strConnectedComputerPassword = strComputerPassword.c_str();
|
||||||
m_strNewComputerPassword = wxEmptyString;
|
m_strNewComputerName = wxEmptyString;
|
||||||
|
m_strNewComputerPassword = wxEmptyString;
|
||||||
|
|
||||||
m_bConnectEvent = false;
|
m_bConnectEvent = false;
|
||||||
|
|
||||||
pFrame->FireConnect();
|
pFrame->FireConnect();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue