Minor code cleanup to use fHaveUPnP instead of #ifdef
authorMatt Corallo <matt@bluematt.me>
Fri, 9 Dec 2011 01:34:11 +0000 (20:34 -0500)
committerMatt Corallo <matt@bluematt.me>
Fri, 13 Jan 2012 03:13:16 +0000 (22:13 -0500)
src/net.cpp

index f354432..74ff79d 100644 (file)
@@ -1716,10 +1716,8 @@ bool StopNode()
     fShutdown = true;
     nTransactionsUpdated++;
     int64 nStart = GetTime();
-    while (vnThreadsRunning[0] > 0 || vnThreadsRunning[2] > 0 || vnThreadsRunning[3] > 0 || vnThreadsRunning[4] > 0 || vnThreadsRunning[6] > 0 || vnThreadsRunning[7] > 0
-#ifdef USE_UPNP
-        || vnThreadsRunning[5] > 0
-#endif
+    while (vnThreadsRunning[0] > 0 || vnThreadsRunning[2] > 0 || vnThreadsRunning[3] > 0 || vnThreadsRunning[4] > 0
+        || (fHaveUPnP && vnThreadsRunning[5] > 0) || vnThreadsRunning[6] > 0 || vnThreadsRunning[7] > 0
     )
     {
         if (GetTime() - nStart > 20)