Dunedan/0ad
1
0
Fork 0
forked from 0ad/0ad
Code Pull Requests Wiki Activity

Fixes MSVC warning C4706: assignment within conditional expression

Browse Source 
This was SVN commit r14519.
This commit is contained in:
historic_bruno 2014-01-06 02:16:09 +00:00
parent 92ed27e3c5
commit 9ccaa42a54
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source/network/NetServer.cpp
View File

@ -231,7 +231,7 @@ void* CNetServerWorker::SetupUPnP(void*)
// If we have a cached URL, try that first, otherwise try getting a valid UPnP device for 10 seconds. We also get our LAN address here.
if (!((!rootDescURL.empty() && UPNP_GetIGDFromUrl(rootDescURL.c_str(), &urls, &data, internalIPAddress, sizeof(internalIPAddress)))
|| ((devlist = upnpDiscover(10000, 0, 0, 0, 0, 0)) && (ret = UPNP_GetValidIGD(devlist, &urls, &data, internalIPAddress, sizeof(internalIPAddress))))))
|| ((devlist = upnpDiscover(10000, 0, 0, 0, 0, 0)) != NULL && (ret = UPNP_GetValidIGD(devlist, &urls, &data, internalIPAddress, sizeof(internalIPAddress))) != 0)))
{
LOGMESSAGE(L"Net server: upnpDiscover failed and no working cached URL.");
return NULL;