From 9ccaa42a54528d9282139c2e472dffe23469e537 Mon Sep 17 00:00:00 2001 From: historic_bruno Date: Mon, 6 Jan 2014 02:16:09 +0000 Subject: [PATCH] Fixes MSVC warning C4706: assignment within conditional expression This was SVN commit r14519. --- source/network/NetServer.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/network/NetServer.cpp b/source/network/NetServer.cpp index 693f985b8f..14c613e184 100644 --- a/source/network/NetServer.cpp +++ b/source/network/NetServer.cpp @@ -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;