[vidalia-svn] r3806: Backport r3803. (vidalia/branches/vidalia-0.1/src/vidalia/config)

[edmanm@xxxxxxxxxxxxxxxxxxx]

Author: edmanm
Date: 2009-05-30 20:19:22 -0400 (Sat, 30 May 2009)
New Revision: 3806

Modified:
   vidalia/branches/vidalia-0.1/src/vidalia/config/upnpcontrol.cpp
Log:

Backport r3803.


Modified: vidalia/branches/vidalia-0.1/src/vidalia/config/upnpcontrol.cpp
===================================================================
--- vidalia/branches/vidalia-0.1/src/vidalia/config/upnpcontrol.cpp	2009-05-31 00:16:58 UTC (rev 3805)
+++ vidalia/branches/vidalia-0.1/src/vidalia/config/upnpcontrol.cpp	2009-05-31 00:19:22 UTC (rev 3806)
@@ -31,8 +31,10 @@
 /** Returns a pointer to this object's singleton instance. */
 UPNPControl* UPNPControl::instance()
 {
-  if (0 == _instance)
-    _instance = new UPNPControl;
+  if (0 == _instance) {
+    _instance = new UPNPControl();
+    _instance->_controlThread->start();
+  }
   return _instance;
 }
 
@@ -50,7 +52,6 @@
 
   _mutex = new QMutex();
   _controlThread = new UPNPControlThread(this);
-  _controlThread->start();
 }
 
 /** Destructor. cleanup() should be called before the object is destroyed.


Property changes on: vidalia/branches/vidalia-0.1/src/vidalia/config/upnpcontrol.cpp
___________________________________________________________________
Added: svn:mergeinfo
   + /vidalia/trunk/src/vidalia/config/UPNPControl.cpp:3803
/vidalia/trunk/src/vidalia/config/upnpcontrol.cpp:3235,3482,3504-3505,3516-3517,3519-3520,3522,3524-3526,3528,3530,3754
/vidalia/trunk/upnpcontrol.cpp:3754