Muldersoft/LameXP
Muldersoft/LameXP
1
0
Fork 0
Code Releases 2 Activity

Fixed a potential live-lock situation: Signals from the QThread can get lost, before we reach the QEventLoop->exec(), even if the required connections already exists. It seems that QApplication::processEvents() will discard signals for our QEventLoop, if that QEventLoop is not running yet! Without the QApplication::processEvents(), those signals would simply be enqueued until we call QEventLoop->exec(). In reality this bug was never triggered under normal circumstances, but it seems on some systems it can take longer to perform the "fade in" than to finish the initialization thread. In that situation the bug *was* triggered and caused the live-lock...

Browse Source
This commit is contained in:
LoRd_MuldeR 2012-02-23 17:00:22 +01:00
parent d92fb7fbcc
commit 3c1938af3c
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Config.h
View File

@ -30,7 +30,7 @@
#define VER_LAMEXP_MINOR_LO 4
#define VER_LAMEXP_TYPE Beta
#define VER_LAMEXP_PATCH 1
#define VER_LAMEXP_BUILD 890
#define VER_LAMEXP_BUILD 891
///////////////////////////////////////////////////////////////////////////////
// Tool versions (minimum expected versions!)

8
src/Dialog_SplashScreen.cpp
View File

@ -26,6 +26,7 @@
#include <QThread>
#include <QMovie>
#include <QKeyEvent>
#include <QTimer>
#include "WinSevenTaskbar.h"
@ -110,7 +111,12 @@ void SplashScreen::showSplash(QThread *thread)
}
//Loop while thread is running
loop->exec();
while(thread->isRunning())
{
QTimer::singleShot(15000, loop, SLOT(quit()));
loop->exec();
if(thread->isRunning()) qWarning("Potential deadlock in Init thread!");
}
//Fade out
for(int i = 100; i >= 0; i--)