aboutsummaryrefslogtreecommitdiff
path: root/src/qt/bitcoin.cpp
diff options
context:
space:
mode:
authorWladimir J. van der Laan <laanwj@gmail.com>2014-09-18 13:14:38 +0200
committerWladimir J. van der Laan <laanwj@gmail.com>2014-09-18 13:21:26 +0200
commita49f11d9edf2f7dbce154ca370494a8f86e013d0 (patch)
tree906f50b1935438b6d9c8bf5d51b61be8e3d4dc00 /src/qt/bitcoin.cpp
parent7fd881367544fcc9e70130bf448a181794da26ab (diff)
downloadbitcoin-a49f11d9edf2f7dbce154ca370494a8f86e013d0.tar.xz
qt: Change splash screen to normal window
Makes it possible to move, minimize, unminimize the window while Bitcoin Core is initializing.
Diffstat (limited to 'src/qt/bitcoin.cpp')
-rw-r--r--src/qt/bitcoin.cpp7
1 files changed, 3 insertions, 4 deletions
diff --git a/src/qt/bitcoin.cpp b/src/qt/bitcoin.cpp
index 6cc6b99ceb..676f218f20 100644
--- a/src/qt/bitcoin.cpp
+++ b/src/qt/bitcoin.cpp
@@ -338,8 +338,7 @@ void BitcoinApplication::createWindow(bool isaTestNet)
void BitcoinApplication::createSplashScreen(bool isaTestNet)
{
- SplashScreen *splash = new SplashScreen(QPixmap(), 0, isaTestNet);
- splash->setAttribute(Qt::WA_DeleteOnClose);
+ SplashScreen *splash = new SplashScreen(0, isaTestNet);
splash->show();
connect(this, SIGNAL(splashFinished(QWidget*)), splash, SLOT(slotFinish(QWidget*)));
}
@@ -423,8 +422,6 @@ void BitcoinApplication::initializeResult(int retval)
}
#endif
- emit splashFinished(window);
-
// If -min option passed, start window minimized.
if(GetBoolArg("-min", false))
{
@@ -434,6 +431,8 @@ void BitcoinApplication::initializeResult(int retval)
{
window->show();
}
+ emit splashFinished(window);
+
#ifdef ENABLE_WALLET
// Now that initialization/startup is done, process any command-line
// bitcoin: URIs or payment requests: