Minor code cleanup to use fHaveUPnP instead of #ifdef

13 years ago · 10ba0a3efc
parent b24e6e4d1b
commit 10ba0a3efc
1 changed files with 2 additions and 4 deletions
--- 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)