Skip to content
Browse files

Fix the logServerWait to exit if wait() is woken up

  • Loading branch information...
1 parent d92b6d4 commit aa93d3f6194020fa9e9d2b6e4b4e52d892fe8575 @Beirdo Beirdo committed Jun 30, 2012
Showing with 3 additions and 3 deletions.
  1. +3 −3 mythtv/libs/libmythbase/loggingserver.cpp
View
6 mythtv/libs/libmythbase/loggingserver.cpp
@@ -989,9 +989,9 @@ void logServerWait(void)
{
// cerr << "waiting" << endl;
QMutexLocker locker(&logThreadStartedMutex);
- while (!logThreadStarting ||
- (logServerThread && logServerThread->isRunning()))
- logThreadStarted.wait(locker.mutex(), 100);
+ while ((!logThreadStarting ||
+ (logServerThread && logServerThread->isRunning())) &&
+ !logThreadStarted.wait(locker.mutex(), 100));
locker.unlock();
// cerr << "done waiting" << endl;
}

0 comments on commit aa93d3f

Please sign in to comment.
Something went wrong with that request. Please try again.