Merge #8231: [Qt] fix a bug where the SplashScreen will not be hidden during startup

laanwj · laanwj · commit 760a6c7cb2ea · 2016-06-22T08:50:14.000+02:00
b3e1348 [Qt] fix a bug where the SplashScreen will not be hidden during startup (Jonas Schnelli)
diff --git a/src/qt/splashscreen.cpp b/src/qt/splashscreen.cpp
@@ -141,6 +141,11 @@ SplashScreen::~SplashScreen()
 void SplashScreen::slotFinish(QWidget *mainWin)
 {
     Q_UNUSED(mainWin);
+
+    /* If the window is minimized, hide() will be ignored. */
+    /* Make sure we de-minimize the splashscreen window before hiding */
+    if (isMinimized())
+        showNormal();
     hide();
 }
 

Original file line number	Diff line number	Diff line change
`@@ -141,6 +141,11 @@ SplashScreen::~SplashScreen()`
`141`	`141`	`void SplashScreen::slotFinish(QWidget *mainWin)`
`142`	`142`	`{`
`143`	`143`	`Q_UNUSED(mainWin);`
	`144`	`+`
	`145`	`+ /* If the window is minimized, hide() will be ignored. */`
	`146`	`+ /* Make sure we de-minimize the splashscreen window before hiding */`
	`147`	`+ if (isMinimized())`
	`148`	`+ showNormal();`
`144`	`149`	`hide();`
`145`	`150`	`}`
`146`	`151`