Skip to content

Commit

Permalink
Merge pull request #12557 from koying/fixupupnp
Browse files Browse the repository at this point in the history
FIXUP: [upnp] inverted conditions
  • Loading branch information
MartijnKaijser committed Jul 23, 2017
2 parents 91191e8 + 56aced7 commit 51a70ff
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion xbmc/Application.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -4559,7 +4559,7 @@ void CApplication::ProcessSlow()

// update upnp server/renderer states
#ifdef HAS_UPNP
if (!CServiceBroker::GetSettings().GetBool(CSettings::SETTING_SERVICES_UPNP) && UPNP::CUPnP::IsInstantiated())
if (CServiceBroker::GetSettings().GetBool(CSettings::SETTING_SERVICES_UPNP) && UPNP::CUPnP::IsInstantiated())
UPNP::CUPnP::GetInstance()->UpdateState();
#endif

Expand Down
2 changes: 1 addition & 1 deletion xbmc/storage/MediaManager.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -221,7 +221,7 @@ void CMediaManager::GetNetworkLocations(VECSOURCES &locations, bool autolocation
#endif// HAS_FILESYSTEM_NFS

#ifdef HAS_UPNP
if (!CServiceBroker::GetSettings().GetBool(CSettings::SETTING_SERVICES_UPNP))
if (CServiceBroker::GetSettings().GetBool(CSettings::SETTING_SERVICES_UPNP))
{
std::string strDevices = g_localizeStrings.Get(33040); //"% Devices"
share.strPath = "upnp://";
Expand Down

0 comments on commit 51a70ff

Please sign in to comment.