Rooba
/
boinc
mirror of https://github.com/BOINC/boinc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1789 from BOINC/fix_select_dialog 

Manager: Fix select computer dialog
This commit is contained in:
David Anderson 2017-03-06 15:26:06 -08:00 committed by GitHub
parent 737a26241f 4f6d905f74
commit 4b85e216ef
2 changed files with 18 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
clientgui/AdvancedFrame.cpp
View File

@ -1434,36 +1434,26 @@ void CAdvancedFrame::OnSelectComputer(wxCommandEvent& WXUNUSED(event)) {
wxString password = wxEmptyString;
CMainDocument* pDoc = wxGetApp().GetDocument();
long lRetVal = -1;
bool bRetrievePasswordFromFile = FALSE;
wxASSERT(pDoc);
wxASSERT(wxDynamicCast(pDoc, CMainDocument));
if (SelectComputer(hostName, portNum, password, false)) {
if (pDoc->IsComputerNameLocal(hostName)) {
lRetVal = pDoc->Connect(
wxT("localhost"),
GUI_RPC_PORT,
wxEmptyString,
TRUE,
TRUE
);
} else {
// Connect to the remote machine
long lPort = GUI_RPC_PORT;
int iPos = hostName.Find(wxT(":"));
if (iPos != wxNOT_FOUND) {
wxString sPort = hostName.substr(iPos + 1);
if (!sPort.ToLong(&lPort)) lPort = GUI_RPC_PORT;
hostName.erase(iPos);
}
lRetVal = pDoc->Connect(
hostName.c_str(),
portNum,
password.c_str(),
TRUE,
FALSE
);
if (SelectComputer(hostName, portNum, password, false)) {
// possibly read password from file if local computername AND no password was entered
if (pDoc->IsComputerNameLocal(hostName) && password == wxEmptyString) {
hostName = wxT("localhost");
bRetrievePasswordFromFile = TRUE;
}
// Connect to the specified host
lRetVal = pDoc->Connect(
hostName.c_str(),
portNum,
password.c_str(),
TRUE,
bRetrievePasswordFromFile
);
if (lRetVal) {
ShowConnectionFailedAlert();
}

5
clientgui/DlgSelectComputer.cpp
View File

@ -236,8 +236,9 @@ void CDlgSelectComputer::OnComputerNameUpdated( wxCommandEvent& WXUNUSED(event)
wxString name = m_ComputerNameCtrl->GetValue();
if (pDoc->IsComputerNameLocal(name)) {
pDoc->m_pNetworkConnection->GetLocalPassword(strPassword);
m_ComputerPasswordCtrl->SetValue(strPassword);
if (pDoc->m_pNetworkConnection->GetLocalPassword(strPassword) == 0) {
m_ComputerPasswordCtrl->SetValue(strPassword);
}
}
}