qt: Avoid splash-screen related memory leak

laanwj · luke-jr · commit e4bea4fb84dc · 2016-12-02T07:50:11.000Z
Make splash screen queue its own deletion when it receives the finished command, instead of relying on WA_DeleteOnClose which doesn't work under these circumstances. Github-Pull: bitcoin#9190 Rebased-From: e4f126a
diff --git a/src/qt/bitcoin.cpp b/src/qt/bitcoin.cpp
@@ -365,9 +365,8 @@ void BitcoinApplication::createWindow(const NetworkStyle *networkStyle)
 void BitcoinApplication::createSplashScreen(const NetworkStyle *networkStyle)
 {
     SplashScreen *splash = new SplashScreen(0, networkStyle);
-    // We don't hold a direct pointer to the splash screen after creation, so use
-    // Qt::WA_DeleteOnClose to make sure that the window will be deleted eventually.
-    splash->setAttribute(Qt::WA_DeleteOnClose);
+    // We don't hold a direct pointer to the splash screen after creation, but the splash
+    // screen will take care of deleting itself when slotFinish happens.
     splash->show();
     connect(this, SIGNAL(splashFinished(QWidget*)), splash, SLOT(slotFinish(QWidget*)));
     connect(this, SIGNAL(requestedShutdown()), splash, SLOT(close()));
diff --git a/src/qt/splashscreen.cpp b/src/qt/splashscreen.cpp
@@ -147,6 +147,7 @@ void SplashScreen::slotFinish(QWidget *mainWin)
     if (isMinimized())
         showNormal();
     hide();
+    deleteLater(); // No more need for this
 }
 
 static void InitMessage(SplashScreen *splash, const std::string &message)

Original file line number	Diff line number	Diff line change
`@@ -147,6 +147,7 @@ void SplashScreen::slotFinish(QWidget *mainWin)`
`147`	`147`	`if (isMinimized())`
`148`	`148`	`showNormal();`
`149`	`149`	`hide();`
	`150`	`+ deleteLater(); // No more need for this`
`150`	`151`	`}`
`151`	`152`
`152`	`153`	`static void InitMessage(SplashScreen *splash, const std::string &message)`