Minor code cleanup to use fHaveUPnP instead of #ifdef

This commit is contained in:
Matt Corallo 2011-12-08 20:34:11 -05:00
parent b24e6e4d1b
commit 10ba0a3efc

View file

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