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

MGR: In the simple attach scenario, only launch the attach wizard if we are not already attached to the project.

This commit is contained in:
Rom Walton 2015-01-06 17:33:37 -05:00
parent 6bc87783dc
commit a88c671310
3 changed files with 41 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
clientgui/AdvancedFrame.cpp
View File

@ -1783,6 +1783,7 @@ void CAdvancedFrame::OnConnect(CFrameEvent& WXUNUSED(event)) {
strProjectName, strProjectURL, strProjectAuthenticator, strProjectInstitution, strProjectDescription, strProjectKnown strProjectName, strProjectURL, strProjectAuthenticator, strProjectInstitution, strProjectDescription, strProjectKnown
) )
){ ){
if (!pDoc->project((char*)strProjectURL.c_str())) {
wasShown = IsShown(); wasShown = IsShown();
Show(); Show();
wasVisible = wxGetApp().IsApplicationVisible(); wasVisible = wxGetApp().IsApplicationVisible();
@ -1807,6 +1808,7 @@ void CAdvancedFrame::OnConnect(CFrameEvent& WXUNUSED(event)) {
// If failure, display the notices tab // If failure, display the notices tab
m_pNotebook->SetSelection(ID_ADVNOTICESVIEW - ID_ADVVIEWBASE); m_pNotebook->SetSelection(ID_ADVNOTICESVIEW - ID_ADVVIEWBASE);
} }
}
} else if (ami.acct_mgr_url.size() && ami.have_credentials) { } else if (ami.acct_mgr_url.size() && ami.have_credentials) {
// Fall through // Fall through
// //

2
clientgui/sg_BoincSimpleFrame.cpp
View File

@ -714,6 +714,7 @@ void CSimpleFrame::OnConnect(CFrameEvent& WXUNUSED(event)) {
strProjectName, strProjectURL, strProjectAuthenticator, strProjectInstitution, strProjectDescription, strProjectKnown strProjectName, strProjectURL, strProjectAuthenticator, strProjectInstitution, strProjectDescription, strProjectKnown
) )
){ ){
if (!pDoc->project((char*)strProjectURL.c_str())) {
wasShown = IsShown(); wasShown = IsShown();
Show(); Show();
wasVisible = wxGetApp().IsApplicationVisible(); wasVisible = wxGetApp().IsApplicationVisible();
@ -731,6 +732,7 @@ void CSimpleFrame::OnConnect(CFrameEvent& WXUNUSED(event)) {
wxURI::Unescape(strProjectDescription), wxURI::Unescape(strProjectDescription),
wxURI::Unescape(strProjectKnown) wxURI::Unescape(strProjectKnown)
); );
}
} else if (ami.acct_mgr_url.size() && ami.have_credentials) { } else if (ami.acct_mgr_url.size() && ami.have_credentials) {
// Fall through // Fall through
// //