[vidalia-svn] r1363: Don't indicate Tor is shutting down until Tor is shutting do (trunk/src/gui)

[edmanm@xxxxxxxxxxxxxxxxxxx]

Author: edmanm
Date: 2006-10-20 19:42:57 -0400 (Fri, 20 Oct 2006)
New Revision: 1363

Modified:
   trunk/src/gui/mainwindow.cpp
Log:
Don't indicate Tor is shutting down until Tor is shutting down.


Modified: trunk/src/gui/mainwindow.cpp
===================================================================
--- trunk/src/gui/mainwindow.cpp	2006-10-20 17:36:20 UTC (rev 1362)
+++ trunk/src/gui/mainwindow.cpp	2006-10-20 23:42:57 UTC (rev 1363)
@@ -413,9 +413,6 @@
   QString errmsg;
   bool shutdown;
   
-  /* Indicate that Tor is about to shut down */
-  _trayIcon->update(IMG_TOR_STOPPING, tr("Tor is stopping"));
-
   /* If we're running a server, give users the option of terminating
    * gracefully so clients have time to find new servers. */
   if (server.isServerEnabled() && !delayedShutdownStarted
@@ -432,7 +429,11 @@
     }
   }
 
-  if (!shutdown) {
+  if (shutdown) {
+    /* Indicate that Tor is about to shut down */
+    _trayIcon->update(IMG_TOR_STOPPING, tr("Tor is stopping"));
+  } else {
+    /* We couldn't tell Tor to stop, for some reason. */
     int response = VMessageBox::warning(this, tr("Error Stopping Tor"),
                      p(tr("Vidalia was unable to stop Tor.")) + p(errmsg),
                      VMessageBox::Ok|VMessageBox::Default|VMessageBox::Escape, 
@@ -444,7 +445,6 @@
     }
     
     /* Tor is still running since stopping failed */
-    _trayIcon->update(IMG_TOR_RUNNING, tr("Tor is running"));
     _isIntentionalExit = false;
   }
 }