From d32fe787e26c036c53349e61f88e8c4c3735ae7d Mon Sep 17 00:00:00 2001
From: Rom Walton <rwalton@ssl.berkeley.edu>
Date: Mon, 21 May 2007 16:07:10 +0000
Subject: [PATCH]     - fixes #182 - System tray icon should be removed for
 both exit         scenarios.

    clientgui/
        BOINCBaseFrame.cpp
        BOINCTaskBar.cpp

svn path=/trunk/boinc/; revision=12704
---
 checkin_notes                | 8 ++++++++
 clientgui/BOINCBaseFrame.cpp | 3 ++-
 clientgui/BOINCTaskBar.cpp   | 2 +-
 3 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/checkin_notes b/checkin_notes
index 8644424c38..e764b7bf0c 100755
--- a/checkin_notes
+++ b/checkin_notes
@@ -5119,3 +5119,11 @@ David  21 May 2007
 
     sched/
         feeder.C
+
+Rom    21 May 2007
+    - fixes #182 - System tray icon should be removed for both exit
+        scenarios.
+        
+    clientgui/
+        BOINCBaseFrame.cpp
+        BOINCTaskBar.cpp
diff --git a/clientgui/BOINCBaseFrame.cpp b/clientgui/BOINCBaseFrame.cpp
index f2691ae34d..2e8ac6607a 100644
--- a/clientgui/BOINCBaseFrame.cpp
+++ b/clientgui/BOINCBaseFrame.cpp
@@ -309,8 +309,9 @@ void CBOINCBaseFrame::OnExit(wxCommandEvent& WXUNUSED(event)) {
         // TaskBarIcon isn't used in Linux
 #if defined(__WXMSW__) || defined(__WXMAC__)
         CTaskBarIcon* pTBI = wxGetApp().GetTaskBarIcon();
-        if (pTBI && !pTBI->m_bTaskbarInitiatedShutdown)
+        if (pTBI && !pTBI->m_bTaskbarInitiatedShutdown) {
             delete pTBI;
+        }
 #endif
         Close(true);
 
diff --git a/clientgui/BOINCTaskBar.cpp b/clientgui/BOINCTaskBar.cpp
index 20cdfae701..352159fc17 100644
--- a/clientgui/BOINCTaskBar.cpp
+++ b/clientgui/BOINCTaskBar.cpp
@@ -116,7 +116,7 @@ void CTaskBarIcon::OnIdle(wxIdleEvent& event) {
 void CTaskBarIcon::OnClose(wxCloseEvent& event) {
     wxLogTrace(wxT("Function Start/End"), wxT("CTaskBarIcon::OnClose - Function Begin"));
 
-    ResetTaskBar();
+    RemoveIcon();
     m_bTaskbarInitiatedShutdown = true;
 
     CBOINCBaseFrame* pFrame = wxGetApp().GetFrame();