Don't emit timeout() signal with lock held.

MythTV · Jun 22, 2012 · bbe7b2a · bbe7b2a
1 parent 14ad67e
commit bbe7b2a
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/mythtv/libs/libmythbase/mythsignalingtimer.cpp b/mythtv/libs/libmythbase/mythsignalingtimer.cpp
@@ -76,9 +76,13 @@ void MythSignalingTimer::run(void)
     RunProlog();
     while (dorun)
     {
-        QMutexLocker lock(&startStopLock);
-        if (dorun && !timerWait.wait(lock.mutex(), millisec))
+        QMutexLocker locker(&startStopLock);
+        if (dorun && !timerWait.wait(locker.mutex(), millisec))
+        {
+            locker.unlock();
             emit timeout();
+            locker.relock();
+        }
     }
     RunEpilog();
     running = false;