Fix minimize and close bugs

furszy · furszy · commit a5fd073747dd · 2021-06-18T13:40:01.000-03:00
coming from btc@05242e937d3fc0144029ccf3b14f98662400dd60 refs bitcoin#8225 To ensure the GUI closes when the "Minimize on close" window option is disabled, and the "Minimize to the tray instead of the taskbar" window option is enbaled, remove a check made against the "Minimize to the tray instead of the taskbar" value, made during GUI closure. To ensure the GUI minimizes to the taskbar when the "Minimize on close" window option is enabled, and the "Minimize to the tray instead of the taskbar" window option is disabled, minimize the GUI and ignore the closure event. Github-Pull: #2377 Rebased-From: d72f7b5
diff --git a/src/qt/pivx/pivxgui.cpp b/src/qt/pivx/pivxgui.cpp
@@ -352,10 +352,14 @@ void PIVXGUI::closeEvent(QCloseEvent* event)
     if (clientModel && clientModel->getOptionsModel()) {
         if (!clientModel->getOptionsModel()->getMinimizeOnClose()) {
             QApplication::quit();
+        } else {
+            QMainWindow::showMinimized();
+            event->ignore();
         }
     }
-#endif
+#else
     QMainWindow::closeEvent(event);
+#endif
 }
 
 

Original file line number	Diff line number	Diff line change
`@@ -352,10 +352,14 @@ void PIVXGUI::closeEvent(QCloseEvent* event)`
`352`	`352`	`if (clientModel && clientModel->getOptionsModel()) {`
`353`	`353`	`if (!clientModel->getOptionsModel()->getMinimizeOnClose()) {`
`354`	`354`	`QApplication::quit();`
	`355`	`+ } else {`
	`356`	`+ QMainWindow::showMinimized();`
	`357`	`+ event->ignore();`
`355`	`358`	`}`
`356`	`359`	`}`
`357`		`-#endif`
	`360`	`+#else`
`358`	`361`	`QMainWindow::closeEvent(event);`
	`362`	`+#endif`
`359`	`363`	`}`
`360`	`364`
`361`	`365`