Browse Source

Merge #8481: Qt: Fix minimize and close bugs

05242e9 Fix minimize and close bugs (adlawren)
tags/v0.15.1
Wladimir J. van der Laan 4 years ago
parent
commit
0d0abcac1e
No account linked to committer's email address
1 changed files with 8 additions and 3 deletions
  1. 8
    3
      src/qt/bitcoingui.cpp

+ 8
- 3
src/qt/bitcoingui.cpp View File

@@ -902,17 +902,22 @@ void BitcoinGUI::closeEvent(QCloseEvent *event)
#ifndef Q_OS_MAC // Ignored on Mac
if(clientModel && clientModel->getOptionsModel())
{
if(!clientModel->getOptionsModel()->getMinimizeToTray() &&
!clientModel->getOptionsModel()->getMinimizeOnClose())
if(!clientModel->getOptionsModel()->getMinimizeOnClose())
{
// close rpcConsole in case it was open to make some space for the shutdown window
rpcConsole->close();

QApplication::quit();
}
else
{
QMainWindow::showMinimized();
event->ignore();
}
}
#endif
#else
QMainWindow::closeEvent(event);
#endif
}

void BitcoinGUI::showEvent(QShowEvent *event)

Loading…
Cancel
Save