diff options
| author | Wladimir J. van der Laan <[email protected]> | 2014-12-16 11:29:35 +0100 |
|---|---|---|
| committer | Wladimir J. van der Laan <[email protected]> | 2014-12-16 11:30:27 +0100 |
| commit | 73cbf0a5273fa18cc0fbda203913819f9ebe4141 (patch) | |
| tree | 22c77dddc8fabe321ef0e032777c0c1fd7c3c83e /src/qt/bitcoingui.cpp | |
| parent | Fix small typos in comments and error messages (diff) | |
| parent | [Qt] the RPC Console should be a QWidget to make window more independent (diff) | |
| download | discoin-73cbf0a5273fa18cc0fbda203913819f9ebe4141.tar.xz discoin-73cbf0a5273fa18cc0fbda203913819f9ebe4141.zip | |
Merge pull request #5258
4a8fc15 [Qt] the RPC Console should be a QWidget to make window more independent (Jonas Schnelli)
Diffstat (limited to 'src/qt/bitcoingui.cpp')
| -rw-r--r-- | src/qt/bitcoingui.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/qt/bitcoingui.cpp b/src/qt/bitcoingui.cpp index 3f5d0a191..c297f0596 100644 --- a/src/qt/bitcoingui.cpp +++ b/src/qt/bitcoingui.cpp @@ -128,7 +128,7 @@ BitcoinGUI::BitcoinGUI(const NetworkStyle *networkStyle, QWidget *parent) : setUnifiedTitleAndToolBarOnMac(true); #endif - rpcConsole = new RPCConsole(enableWallet ? this : 0); + rpcConsole = new RPCConsole(0); #ifdef ENABLE_WALLET if(enableWallet) { @@ -234,6 +234,8 @@ BitcoinGUI::~BitcoinGUI() delete appMenuBar; MacDockIconHandler::instance()->setMainWindow(NULL); #endif + + delete rpcConsole; } void BitcoinGUI::createActions(const NetworkStyle *networkStyle) @@ -827,6 +829,9 @@ void BitcoinGUI::closeEvent(QCloseEvent *event) if(!clientModel->getOptionsModel()->getMinimizeToTray() && !clientModel->getOptionsModel()->getMinimizeOnClose()) { + // close rpcConsole in case it was open to make some space for the shutdown window + rpcConsole->close(); + QApplication::quit(); } } |