From ca933d1b7ed72a2b1e9fe8e9d06a6548f6e0452f Mon Sep 17 00:00:00 2001 From: lordmulder Date: Sat, 24 Mar 2012 19:10:37 +0100 Subject: [PATCH] Minor code clean-up. --- res/localization/LameXP_UK.qm | Bin 78938 -> 79346 bytes src/Config.h | 4 ++-- src/Dialog_SplashScreen.cpp | 12 +++++++----- 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/res/localization/LameXP_UK.qm b/res/localization/LameXP_UK.qm index 8209d30c9af00b59a54d8fc23992b72d862c3c12..fd6004651ae232f20ebc20ec60765abc1b3b08b6 100644 GIT binary patch delta 4544 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 F{{wAOFH!&i diff --git a/src/Config.h b/src/Config.h index bc72a52d..ccf00ecf 100644 --- a/src/Config.h +++ b/src/Config.h @@ -29,8 +29,8 @@ #define VER_LAMEXP_MINOR_HI 0 #define VER_LAMEXP_MINOR_LO 4 #define VER_LAMEXP_TYPE Beta -#define VER_LAMEXP_PATCH 7 -#define VER_LAMEXP_BUILD 917 +#define VER_LAMEXP_PATCH 8 +#define VER_LAMEXP_BUILD 918 /////////////////////////////////////////////////////////////////////////////// // Tool versions (minimum expected versions!) diff --git a/src/Dialog_SplashScreen.cpp b/src/Dialog_SplashScreen.cpp index 1a5bbb62..9620cc47 100644 --- a/src/Dialog_SplashScreen.cpp +++ b/src/Dialog_SplashScreen.cpp @@ -119,13 +119,15 @@ void SplashScreen::showSplash(QThread *thread) timer->start(30720); //Loop while thread is still running - bool bIsRunning = THREAD_RUNNING(thread); - while(bIsRunning) + if(bool bIsRunning = THREAD_RUNNING(thread)) { - loop->exec(); - if(bIsRunning = THREAD_RUNNING(thread)) + while(bIsRunning) { - qWarning("Potential deadlock in initialization thread!"); + loop->exec(); + if(bIsRunning = THREAD_RUNNING(thread)) + { + qWarning("Potential deadlock in initialization thread!"); + } } } -- 2.11.0