[vidalia-svn] r2543: Call shutdown code on exit, but it still fails with "Socket (in vidalia/branches/upnp/src/vidalia: . config)

[sjmurdoch@xxxxxxxxxxxxxxxxxxx]

Author: sjmurdoch
Date: 2008-04-28 08:48:55 -0400 (Mon, 28 Apr 2008)
New Revision: 2543

Modified:
   vidalia/branches/upnp/src/vidalia/config/upnpcontrol.cpp
   vidalia/branches/upnp/src/vidalia/mainwindow.cpp
Log:
Call shutdown code on exit, but it still fails with "Socket error"

Modified: vidalia/branches/upnp/src/vidalia/config/upnpcontrol.cpp
===================================================================
--- vidalia/branches/upnp/src/vidalia/config/upnpcontrol.cpp	2008-04-28 12:08:43 UTC (rev 2542)
+++ vidalia/branches/upnp/src/vidalia/config/upnpcontrol.cpp	2008-04-28 12:48:55 UTC (rev 2543)
@@ -164,7 +164,7 @@
   // Remove the mapping
   int retval = UPNP_DeletePortMapping(urls.controlURL, data.servicetype, sPort, "TCP");
   if(UPNPCOMMAND_SUCCESS != retval) {
-#ifdef UPNPCONTROL_DEBUG   
+#ifdef UPNPCONTROL_DEBUG
     printf("DeletePortMapping() failed with code %d\n", retval);
     fflush(stdout);
 #endif

Modified: vidalia/branches/upnp/src/vidalia/mainwindow.cpp
===================================================================
--- vidalia/branches/upnp/src/vidalia/mainwindow.cpp	2008-04-28 12:08:43 UTC (rev 2542)
+++ vidalia/branches/upnp/src/vidalia/mainwindow.cpp	2008-04-28 12:48:55 UTC (rev 2543)
@@ -225,12 +225,13 @@
   if (_torControl->isVidaliaRunningTor()) {
     /* Kill our Tor process now */ 
     _torControl->stop();
-
-    /* Disable port forwarding */
-    ServerSettings settings(_torControl);
-    settings.configurePortForwarding(false);
   }
 
+  /* Disable port forwarding */
+  // TODO: This causes "Socket error: socket, 10093". Why?
+  ServerSettings settings(_torControl);
+  settings.configurePortForwarding(false);
+
   if (_proxyProcess->state() != QProcess::NotRunning) {
     /* Close the proxy server (Polipo ignores the WM_CLOSE event sent by
      * terminate() so we have to kill() it) */