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

MGR: I'm not sure what I was thinking, but the attach wizard should always run if the client isn't attached to any projects.

This commit is contained in:
Rom Walton 2016-02-10 10:51:10 -05:00
parent 30523d9a47
commit c47acc111f
2 changed files with 26 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
clientgui/AdvancedFrame.cpp
View File

@ -1912,10 +1912,6 @@ void CAdvancedFrame::OnConnect(CFrameEvent& WXUNUSED(event)) {
wxGetApp().ShowApplication(true); wxGetApp().ShowApplication(true);
pWizard = new CWizardAttach(this); pWizard = new CWizardAttach(this);
if ( strProjectURL.size() &&
//(strProjectAuthenticator.size() || strProjectSetupCookie.size()) &&
!pDoc->project((char*)strProjectURL.c_str())
){
if (pWizard->Run( if (pWizard->Run(
wxURI::Unescape(strProjectName), wxURI::Unescape(strProjectName),
wxURI::Unescape(strProjectURL), wxURI::Unescape(strProjectURL),
@ -1934,7 +1930,6 @@ void CAdvancedFrame::OnConnect(CFrameEvent& WXUNUSED(event)) {
m_pNotebook->SetSelection(ID_ADVNOTICESVIEW - ID_ADVVIEWBASE); m_pNotebook->SetSelection(ID_ADVNOTICESVIEW - ID_ADVVIEWBASE);
} }
} }
}
// Update the menus // Update the menus
DeleteMenu(); DeleteMenu();

5
clientgui/sg_BoincSimpleFrame.cpp
View File

@ -837,10 +837,6 @@ void CSimpleFrame::OnConnect(CFrameEvent& WXUNUSED(event)) {
wxGetApp().ShowApplication(true); wxGetApp().ShowApplication(true);
pWizard = new CWizardAttach(this); pWizard = new CWizardAttach(this);
if ( strProjectURL.size() &&
(strProjectAuthenticator.size() || strProjectSetupCookie.size()) &&
!pDoc->project((char*)strProjectURL.c_str())
){
pWizard->Run( pWizard->Run(
wxURI::Unescape(strProjectName), wxURI::Unescape(strProjectName),
wxURI::Unescape(strProjectURL), wxURI::Unescape(strProjectURL),
@ -853,7 +849,6 @@ void CSimpleFrame::OnConnect(CFrameEvent& WXUNUSED(event)) {
bEmbedded bEmbedded
); );
} }
}
if (pWizard) { if (pWizard) {
pWizard->Destroy(); pWizard->Destroy();