pupnp: wait on condition

Change-Id: I053ca22980267a8e2fd04e73e9a0c1e4a1064248

src/upnp/protocol/pupnp/pupnp.cpp

@@ -86,21 +86,29 @@ PUPnP::PUPnP()
     pupnpThread_ = std::thread([this] {
         std::unique_lock<std::mutex> lk(ctrlptMutex_);
         while (pupnpRun_) {
-            pupnpCv_.wait(lk);
+            pupnpCv_.wait(lk, [this]{
+                return not clientRegistered_ or
+                       not pupnpRun_ or
+                       searchForIgd_ or
+                       not dwnldlXmlList_.empty();
+            });
 
             if (not clientRegistered_) {
                 // Register Upnp control point.
                 int upnp_err = UpnpRegisterClient(ctrlPtCallback, this, &ctrlptHandle_);
-                if (upnp_err != UPNP_E_SUCCESS)
+                if (upnp_err != UPNP_E_SUCCESS) {
                     JAMI_ERR("PUPnP: Can't register client: %s", UpnpGetErrorMessage(upnp_err));
-                else
+                    pupnpRun_ = false;
+                    break;
+                } else
                     clientRegistered_ = true;
             }
 
             if (not pupnpRun_)
                 break;
 
-            if (clientRegistered_ and searchForIgd_) {
+            if (clientRegistered_) {
+                if (searchForIgd_) {
                     // Send out search for multiple types of devices, as some routers may possibly only reply to one.
                     UpnpSearchAsync(ctrlptHandle_, SEARCH_TIMEOUT, UPNP_ROOT_DEVICE, this);
                     UpnpSearchAsync(ctrlptHandle_, SEARCH_TIMEOUT, UPNP_IGD_DEVICE, this);
@@ -111,7 +119,7 @@ PUPnP::PUPnP()
                     searchForIgd_ = false;
                 }
 
-            if (clientRegistered_) {
+                if (not dwnldlXmlList_.empty()) {
                     auto xmlList = std::move(dwnldlXmlList_);
                     decltype(xmlList) finished {};
 
@@ -138,6 +146,7 @@ PUPnP::PUPnP()
                     }
                 }
             }
+        }
 
         UpnpFinish();
     });