Merge pull request #10249 from MartijnKaijser/upnp

xbmc · Aug 13, 2016 · 852f4d7 · 852f4d7
2 parents 0671eaf + 851af62
commit 852f4d7
Showing 1 changed file with 14 additions and 3 deletions.
diff --git a/xbmc/network/NetworkServices.cpp b/xbmc/network/NetworkServices.cpp
@@ -827,9 +827,20 @@ bool CNetworkServices::StartUPnP()
   bool ret = false;
 #ifdef HAS_UPNP
   ret |= StartUPnPClient();
-  ret |= StartUPnPServer();
-  ret |= StartUPnPController();
-  ret |= StartUPnPRenderer();
+  if (CSettings::GetInstance().GetBool(CSettings::SETTING_SERVICES_UPNPSERVER))
+  {
+   ret |= StartUPnPServer();
+  }
+
+  if (CSettings::GetInstance().GetBool(CSettings::SETTING_SERVICES_UPNPCONTROLLER))
+  {
+    ret |= StartUPnPController();
+  }
+
+  if (CSettings::GetInstance().GetBool(CSettings::SETTING_SERVICES_UPNPRENDERER))
+  {
+    ret |= StartUPnPRenderer();
+  }
 #endif // HAS_UPNP
   return ret;
 }