From 48394ceda4a2775ab0788696685b65c8e59f0f80 Mon Sep 17 00:00:00 2001
From: Charlie Fenton <charlief@example.com>
Date: Tue, 1 Jul 2008 02:23:34 +0000
Subject: [PATCH] MGR: Reset messages whenver connecting or reconnecting to
 client

svn path=/trunk/boinc/; revision=15518
---
 checkin_notes              | 9 +++++++++
 clientgui/MainDocument.cpp | 5 ++---
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/checkin_notes b/checkin_notes
index a4fb72ce21..b131cff6f1 100644
--- a/checkin_notes
+++ b/checkin_notes
@@ -5271,3 +5271,12 @@ David  30 June 2008
         sched_send.C
     tools/
         process_results_template.C
+
+Charlie 30 June 2008
+    - MGR: Reset messages whenver connecting or reconnecting to client.  Fixes 2 
+        bugs: stale messages if client on remote host was stopped and restarted 
+        while local manager was connected to it but minimized, and stale messages 
+        when local client exited and was automatically restarted by Manager.
+        
+    clientgui/
+        MainDocument.cpp
diff --git a/clientgui/MainDocument.cpp b/clientgui/MainDocument.cpp
index 329da1def7..e107a2c2ce 100644
--- a/clientgui/MainDocument.cpp
+++ b/clientgui/MainDocument.cpp
@@ -509,9 +509,7 @@ int CMainDocument::Connect(const wxChar* szComputer, int iPort, const wxChar* sz
     m_pNetworkConnection->SetComputer(szComputer, iPort, szComputerPassword, bUseDefaultPassword);
     m_pNetworkConnection->FireReconnectEvent();
 
-    if (szComputer != strOldMachineName) {
-        ResetMessageState();
-    }
+    ResetMessageState();
     return 0;
 }
 
@@ -519,6 +517,7 @@ int CMainDocument::Connect(const wxChar* szComputer, int iPort, const wxChar* sz
 int CMainDocument::Reconnect() {
     m_pNetworkConnection->ForceReconnect();
     m_pNetworkConnection->FireReconnectEvent();
+    ResetMessageState();
     return 0;
 }