mirror of
https://github.com/bitcoin/bitcoin.git
synced 2025-02-03 09:56:38 -05:00
Merge #8481: Qt: Fix minimize and close bugs
05242e9
Fix minimize and close bugs (adlawren)
This commit is contained in:
commit
0d0abcac1e
1 changed files with 8 additions and 3 deletions
|
@ -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…
Add table
Reference in a new issue