Merge branch 'development' into LTS_development

lib/shared_memory.cpp

@@ -1147,8 +1147,8 @@ namespace IPC {
       }
       memset(empty, 0, payLen);
     }
-    while (offsetOnPage == -1) {
-      {
+    uint32_t attempts = 0;
+    while (offsetOnPage == -1 && (++attempts) < 20) {
       for (char i = 'A'; i <= 'Z'; i++) {
         myPage.init(baseName.substr(1) + i, (4096 << (i - 'A')), false, false);
         if (!myPage.mapped) {
@@ -1174,11 +1174,14 @@ namespace IPC {
           break;
         }
       }
-      }
       if (offsetOnPage == -1) {
         Util::wait(500);
       }
     }
+    if (offsetOnPage == -1){
+      FAIL_MSG("Could not register on page for %s", baseName.c_str());
+      myPage.close();
+    }
     if (empty) {
       free(empty);
     }

src/input/input.cpp

@@ -542,7 +542,7 @@ namespace Mist {
       pullLock.post();
       pullLock.close();
       pullLock.unlink();
-      WARN_MSG("No tracks found, cancelling");
+      INFO_MSG("No tracks found, cancelling");
       return;
     }
     nProxy.userClient.countAsViewer = false;