Merge 1f1478c263 into 9087f53edf

common/JackMessageBuffer.cpp

@@ -189,14 +189,13 @@ int JackMessageBuffer::SetInitCallback(JackThreadInitCallback callback, void *ar
             fGuard.Signal();
             JackSleep(1000);
         }
-        if (count == 1000) goto error;
+        if (count == 1000)
+            jack_error("JackMessageBuffer::SetInitCallback : signal lost");
+            return -1;
     #endif
-    
         return 0;
     }
-    
-error:
-    jack_error("JackMessageBuffer::SetInitCallback : callback cannot be executed");
+    jack_error("JackMessageBuffer::SetInitCallback : callback could not be executed");
     return -1;
 }