aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorWladimir J. van der Laan <[email protected]>2016-06-22 08:49:31 +0200
committerWladimir J. van der Laan <[email protected]>2016-06-22 08:50:14 +0200
commit760a6c7cb2ea23c62410f870400b707570b2aec7 (patch)
tree589ee5e1e02667bafe55d89b3e073c8fd342c726 /src
parentMerge #8222: Enable mempool consistency checks in unit tests (diff)
parent[Qt] fix a bug where the SplashScreen will not be hidden during startup (diff)
downloaddiscoin-760a6c7cb2ea23c62410f870400b707570b2aec7.tar.xz
discoin-760a6c7cb2ea23c62410f870400b707570b2aec7.zip
Merge #8231: [Qt] fix a bug where the SplashScreen will not be hidden during startup
b3e1348 [Qt] fix a bug where the SplashScreen will not be hidden during startup (Jonas Schnelli)
Diffstat (limited to 'src')
-rw-r--r--src/qt/splashscreen.cpp5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/qt/splashscreen.cpp b/src/qt/splashscreen.cpp
index b46321fa8..e36d86fdd 100644
--- 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();
}