[vidalia-svn] r2569: Apparently MainWindow also calls ServerSettings::configurePo (in vidalia: . branches/upnp/src/vidalia/config)

[edmanm@xxxxxxxxxxxxxxxxxxx]

Author: edmanm
Date: 2008-05-09 08:44:53 -0400 (Fri, 09 May 2008)
New Revision: 2569

Modified:
   vidalia/
   vidalia/branches/upnp/src/vidalia/config/serversettings.cpp
Log:
 r298@thebe:  edmanm | 2008-05-09 08:45:31 -0400
 Apparently MainWindow also calls ServerSettings::configurePortForwarding() too.
 Patch from Steven.



Property changes on: vidalia
___________________________________________________________________
 svk:merge ticket from /local/vidalia [r298] on 45a62a8a-8088-484c-baad-c7b3e776dd32

Modified: vidalia/branches/upnp/src/vidalia/config/serversettings.cpp
===================================================================
--- vidalia/branches/upnp/src/vidalia/config/serversettings.cpp	2008-05-09 05:31:14 UTC (rev 2568)
+++ vidalia/branches/upnp/src/vidalia/config/serversettings.cpp	2008-05-09 12:44:53 UTC (rev 2569)
@@ -136,8 +136,7 @@
 {
   bool rc;
 
-  if (isUpnpEnabled())
-    configurePortForwarding();
+  configurePortForwarding();
 
   if (isServerEnabled()) {
     rc = torControl()->setConf(confValues(), errmsg);
@@ -176,10 +175,8 @@
   quint16 ORPort, DirPort;
   bool enableORPort, enableDirPort;
 
-  bool UPNPEnabled = true;
-
   // This is how the tickbox should control UPNP
-  if (!UPNPEnabled)
+  if (!isUpnpEnabled())
     return;
 
   ORPort = getORPort();