Changeset 91

Timestamp:

01/15/06 18:05:42 (3 years ago)

Author:

edmanm

Message:

Vidalia will close Tor gracefully when the application exits.

Location:

trunk/src/gui

Files:

• mainwindow.cpp (modified) (1 diff)
• mainwindow.h (modified) (1 diff)

trunk/src/gui/mainwindow.cpp

@@ -65 +65 @@
     delete _torControl;
   }
+}
+
+/** Called when the application is closing, by selecting "Exit" from the tray
+ * menu. This function disconnects the control socket and ends the Tor
+ * process. */
+void
+MainWindow::close()
+{
+  /* Disconnect all of the TorControl object's signals */
+  disconnect(_torControl, 0, 0, 0);
+
+  /* Close the control socket */
+  if (_torControl->isConnected()) {
+    _torControl->disconnect();
+  }
+
+  /* Stop the Tor process */
+  if (_torControl->isRunning()) {
+    _torControl->stop();
+  }
+
+  /* And then quit for real */
+  QMainWindow::close();
 }
 

trunk/src/gui/mainwindow.h

@@ -46 +46 @@
   void stopped(int errorCode, QProcess::ExitStatus exitStatus);
   void about();
+  void close();
 
 private: