- 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

@@ -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

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);
 

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();