diff options
| author | Matt Corallo <matt@bluematt.me> | 2011-12-08 20:34:11 -0500 |
|---|---|---|
| committer | Matt Corallo <matt@bluematt.me> | 2012-01-12 22:13:16 -0500 |
| commit | 10ba0a3efc350b82d1415736a545f17e739c0098 (patch) | |
| tree | a8028bdff4a5596a49953953e5689c7d6bc2a50d /src/net.cpp | |
| parent | b24e6e4d1b917210b9e22711fb2535f53e949547 (diff) | |
| download | bitcoin-10ba0a3efc350b82d1415736a545f17e739c0098.tar.xz | |
Minor code cleanup to use fHaveUPnP instead of #ifdef
Diffstat (limited to 'src/net.cpp')
| -rw-r--r-- | src/net.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/net.cpp b/src/net.cpp index f3544326c3..74ff79d1d9 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) |