From c47acc111f47d68f5c80c533f75ed19db19a4113 Mon Sep 17 00:00:00 2001
From: Rom Walton <romw@romwnet.org>
Date: Wed, 10 Feb 2016 10:51:10 -0500
Subject: [PATCH] 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.

---
 clientgui/AdvancedFrame.cpp       | 35 +++++++++++++------------------
 clientgui/sg_BoincSimpleFrame.cpp | 27 ++++++++++--------------
 2 files changed, 26 insertions(+), 36 deletions(-)

diff --git a/clientgui/AdvancedFrame.cpp b/clientgui/AdvancedFrame.cpp
index 1939801f41..37ca39dc2f 100644
--- a/clientgui/AdvancedFrame.cpp
+++ b/clientgui/AdvancedFrame.cpp
@@ -1912,27 +1912,22 @@ void CAdvancedFrame::OnConnect(CFrameEvent& WXUNUSED(event)) {
         wxGetApp().ShowApplication(true);
         pWizard = new CWizardAttach(this);
 
-        if ( strProjectURL.size() && 
-            //(strProjectAuthenticator.size() || strProjectSetupCookie.size()) &&
-            !pDoc->project((char*)strProjectURL.c_str()) 
+        if (pWizard->Run(
+                wxURI::Unescape(strProjectName),
+                wxURI::Unescape(strProjectURL),
+                wxURI::Unescape(strProjectAuthenticator),
+                wxURI::Unescape(strProjectInstitution),
+                wxURI::Unescape(strProjectDescription),
+                wxURI::Unescape(strProjectKnown),
+                wxURI::Unescape(strProjectSetupCookie),
+                bAccountKeyDetected,
+                bEmbedded)
         ){
-            if (pWizard->Run(
-                    wxURI::Unescape(strProjectName),
-                    wxURI::Unescape(strProjectURL),
-                    wxURI::Unescape(strProjectAuthenticator),
-                    wxURI::Unescape(strProjectInstitution),
-                    wxURI::Unescape(strProjectDescription),
-                    wxURI::Unescape(strProjectKnown),
-                    wxURI::Unescape(strProjectSetupCookie),
-                    bAccountKeyDetected,
-                    bEmbedded)
-            ){
-                // If successful, display the work tab
-                m_pNotebook->SetSelection(ID_ADVTASKSVIEW - ID_ADVVIEWBASE);
-            } else {
-                // If failure, display the notices tab
-                m_pNotebook->SetSelection(ID_ADVNOTICESVIEW - ID_ADVVIEWBASE);
-            }
+            // If successful, display the work tab
+            m_pNotebook->SetSelection(ID_ADVTASKSVIEW - ID_ADVVIEWBASE);
+        } else {
+            // If failure, display the notices tab
+            m_pNotebook->SetSelection(ID_ADVNOTICESVIEW - ID_ADVVIEWBASE);
         }
     }
 
diff --git a/clientgui/sg_BoincSimpleFrame.cpp b/clientgui/sg_BoincSimpleFrame.cpp
index da24aa4b99..8aafea97df 100755
--- a/clientgui/sg_BoincSimpleFrame.cpp
+++ b/clientgui/sg_BoincSimpleFrame.cpp
@@ -837,22 +837,17 @@ void CSimpleFrame::OnConnect(CFrameEvent& WXUNUSED(event)) {
         wxGetApp().ShowApplication(true);
         pWizard = new CWizardAttach(this);
 
-        if ( strProjectURL.size() && 
-            (strProjectAuthenticator.size() || strProjectSetupCookie.size()) &&
-            !pDoc->project((char*)strProjectURL.c_str()) 
-        ){
-            pWizard->Run(
-                wxURI::Unescape(strProjectName),
-                wxURI::Unescape(strProjectURL),
-                wxURI::Unescape(strProjectAuthenticator),
-                wxURI::Unescape(strProjectInstitution),
-                wxURI::Unescape(strProjectDescription),
-                wxURI::Unescape(strProjectKnown),
-                wxURI::Unescape(strProjectSetupCookie),
-                bAccountKeyDetected,
-                bEmbedded
-            );
-        }
+        pWizard->Run(
+            wxURI::Unescape(strProjectName),
+            wxURI::Unescape(strProjectURL),
+            wxURI::Unescape(strProjectAuthenticator),
+            wxURI::Unescape(strProjectInstitution),
+            wxURI::Unescape(strProjectDescription),
+            wxURI::Unescape(strProjectKnown),
+            wxURI::Unescape(strProjectSetupCookie),
+            bAccountKeyDetected,
+            bEmbedded
+        );
     }
 
  	if (pWizard) {