From 2cde48af31aba7852eb5c8c99682bd07b6f653c3 Mon Sep 17 00:00:00 2001
From: Rom Walton <rwalton@ssl.berkeley.edu>
Date: Tue, 23 Jan 2007 21:14:08 +0000
Subject: [PATCH] *** empty log message ***

svn path=/trunk/boinc/; revision=11941
---
 checkin_notes              | 7 +++++++
 clientgui/MainDocument.cpp | 9 +++++++--
 clientgui/MainDocument.h   | 1 +
 3 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/checkin_notes b/checkin_notes
index 140a97447e..b73c6c2d9a 100755
--- a/checkin_notes
+++ b/checkin_notes
@@ -1000,3 +1000,10 @@ David  23 Jan 2007
     clientgui/
         ViewWork.cpp
         ViewWorkGrid.cpp
+
+Rom    23 Jan 2007
+    - MGR: When connecting to a remote machine, don't reset the computer name
+        and password back to the local machine during the reconnect state.
+        
+    clientgui/
+        MainDocument.cpp, .h
diff --git a/clientgui/MainDocument.cpp b/clientgui/MainDocument.cpp
index 0248f7d2dc..b2225edece 100644
--- a/clientgui/MainDocument.cpp
+++ b/clientgui/MainDocument.cpp
@@ -51,6 +51,7 @@ CNetworkConnection::CNetworkConnection(CMainDocument* pDocument) :
     m_bReconnecting = false;
     m_bForceReconnect = false;
     m_bReconnectOnError = false;
+    m_bNewConnection = false;
 }
 
 
@@ -192,6 +193,7 @@ int CNetworkConnection::SetComputer(const wxChar* szComputer, const wxChar* szPa
     m_strNewComputerPassword.Empty();
     m_bUseDefaultPassword = FALSE;
 
+    m_bNewConnection = true;
     m_strNewComputerName = szComputer;
     m_strNewComputerPassword = szPassword;
     m_bUseDefaultPassword = bUseDefaultPassword;
@@ -237,8 +239,10 @@ void CNetworkConnection::SetStateReconnecting() {
         m_bReconnectOnError = false;
         m_bForceReconnect = false;
         m_bReconnecting = true;
-        m_strNewComputerName = m_strConnectedComputerName;
-        m_strNewComputerPassword = m_strConnectedComputerPassword;
+        if (!m_bNewConnection) {
+            m_strNewComputerName = m_strConnectedComputerName;
+            m_strNewComputerPassword = m_strConnectedComputerPassword;
+        }
     }
 }
 
@@ -254,6 +258,7 @@ void CNetworkConnection::SetStateSuccess(wxString& strComputer, wxString& strCom
         m_strConnectedComputerPassword = strComputerPassword;
         m_strNewComputerName = wxEmptyString;
         m_strNewComputerPassword = wxEmptyString;
+        m_bNewConnection = false;
 
         m_bConnectEvent = false;
 
diff --git a/clientgui/MainDocument.h b/clientgui/MainDocument.h
index 32d2393db9..f70420798f 100644
--- a/clientgui/MainDocument.h
+++ b/clientgui/MainDocument.h
@@ -61,6 +61,7 @@ private:
     bool           m_bConnected;
     bool           m_bReconnecting;
     bool           m_bUseDefaultPassword;
+    bool           m_bNewConnection;
     wxString       m_strNewComputerName;
     wxString       m_strNewComputerPassword;
     wxString       m_strConnectedComputerName;