OSDN Git Service

Workaround for Windows XP: It appears that QThread::isRunning() may return TRUE even...
authorlordmulder <mulder2@gmx.de>
Thu, 22 Mar 2012 21:26:54 +0000 (22:26 +0100)
committerlordmulder <mulder2@gmx.de>
Thu, 22 Mar 2012 21:26:54 +0000 (22:26 +0100)
src/Config.h
src/Dialog_SplashScreen.cpp

index f6aead6..c1f22fb 100644 (file)
@@ -30,7 +30,7 @@
 #define VER_LAMEXP_MINOR_LO                                    4
 #define VER_LAMEXP_TYPE                                                Beta
 #define VER_LAMEXP_PATCH                                       7
-#define VER_LAMEXP_BUILD                                       912
+#define VER_LAMEXP_BUILD                                       914
 
 ///////////////////////////////////////////////////////////////////////////////
 // Tool versions (minimum expected versions!)
index 130c104..d68df63 100644 (file)
@@ -117,16 +117,20 @@ void SplashScreen::showSplash(QThread *thread)
        //Start the timer
        timer->start(30720);
 
-       //Loop while thread is running
+       //Loop while thread is still running
        while(thread->isRunning())
        {
                loop->exec();
                if(thread->isRunning())
                {
-                       qWarning("Potential deadlock in initialization thread!");
+                       QThread::yieldCurrentThread();
+                       if(thread->isRunning())
+                       {
+                               qWarning("Potential deadlock in initialization thread!");
+                       }
                }
        }
-       
+
        //Stop the timer
        timer->stop();