diff --git a/src/Config.h b/src/Config.h
index 22902481..f83c0bf4 100644
--- a/src/Config.h
+++ b/src/Config.h
@@ -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!)
diff --git a/src/Dialog_SplashScreen.cpp b/src/Dialog_SplashScreen.cpp
index 579986c9..48461da5 100644
--- a/src/Dialog_SplashScreen.cpp
+++ b/src/Dialog_SplashScreen.cpp
@@ -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--)