From: Matt Corallo <matt@bluematt.me>
Date: Fri, 9 Dec 2011 01:34:11 +0000 (-0500)
Subject: Minor code cleanup to use fHaveUPnP instead of #ifdef
X-Git-Tag: v0.4.0-unstable~129^2~266^2
X-Git-Url: https://git.novaco.in/?a=commitdiff_plain;h=10ba0a3efc350b82d1415736a545f17e739c0098;hp=b24e6e4d1b917210b9e22711fb2535f53e949547;p=novacoin.git

Minor code cleanup to use fHaveUPnP instead of #ifdef
---

diff --git a/src/net.cpp b/src/net.cpp
index f354432..74ff79d 100644
--- a/src/net.cpp
+++ b/src/net.cpp
@@ -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)