From aaade7b57d6f9f5653692b474057d33e55c86237 Mon Sep 17 00:00:00 2001
From: Rom Walton <rwalton@ssl.berkeley.edu>
Date: Mon, 19 Dec 2011 22:16:49 +0000
Subject: [PATCH]     - MGR: Partial fix for wizard problem when a client
 automatically attempts to attach         to an account manager via cookies. 
 This fix is good enough for the 6.8 client.         We'll need to do a little
 more for 7.x and beyond.

    clientgui/
        WizardAttach.cpp

svn path=/trunk/boinc/; revision=24827
---
 checkin_notes              | 8 ++++++++
 clientgui/WizardAttach.cpp | 4 ++--
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/checkin_notes b/checkin_notes
index 03dedb4ca5..418445a923 100644
--- a/checkin_notes
+++ b/checkin_notes
@@ -9145,3 +9145,11 @@ Rom    19 Dec 2011
     win_build/installerv2/redist/Windows/x64/
         boinccas.dll
         boinccas95.dll
+
+Rom    19 Dec 2011
+    - MGR: Partial fix for wizard problem when a client automatically attempts to attach
+        to an account manager via cookies.  This fix is good enough for the 6.8 client.
+        We'll need to do a little more for 7.x and beyond.
+        
+    clientgui/
+        WizardAttach.cpp
diff --git a/clientgui/WizardAttach.cpp b/clientgui/WizardAttach.cpp
index 423e7b2fac..38376cced2 100644
--- a/clientgui/WizardAttach.cpp
+++ b/clientgui/WizardAttach.cpp
@@ -516,8 +516,8 @@ wxWizardPageEx* CWizardAttach::_PopPageTransition() {
         if (m_PageTransition.size() > 0) {
             pPage = m_PageTransition.top();
             m_PageTransition.pop();
-            if ((pPage == m_ProjectPropertiesPage) || (pPage == m_ProjectProcessingPage) ||
-                (pPage == m_AccountManagerPropertiesPage) || (pPage == m_AccountManagerProcessingPage)) 
+            if ((pPage == m_ProjectPropertiesPage) ||
+                (pPage == m_AccountManagerPropertiesPage)) 
             {
                 // We want to go back to the page before we attempted to communicate
                 //   with any server.