aboutsummaryrefslogtreecommitdiff
path: root/src/qt
diff options
context:
space:
mode:
authorWladimir J. van der Laan <laanwj@gmail.com>2016-06-22 08:49:31 +0200
committerWladimir J. van der Laan <laanwj@gmail.com>2016-06-22 08:50:14 +0200
commit760a6c7cb2ea23c62410f870400b707570b2aec7 (patch)
tree589ee5e1e02667bafe55d89b3e073c8fd342c726 /src/qt
parent961893f26e5cc27c5acdcb8447725ded0790e79a (diff)
parentb3e1348c46573630e5899b53f77236fd51f78d13 (diff)
downloadbitcoin-760a6c7cb2ea23c62410f870400b707570b2aec7.tar.xz
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/qt')
-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 b46321fa86..e36d86fddd 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();
}