DragonX/dragonx
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 3 Wiki Activity

qt: Add null check in setClientModel(0)

Browse Source 
Don't clear tray icon menu if it was never created.
Necessary precaution after #4649.
This commit is contained in:
Wladimir J. van der Laan
2014-08-26 17:44:57 +02:00
parent d49b0876a4
commit f30801afbd
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/qt/bitcoingui.cpp
View File

@@ -455,10 +455,13 @@ void BitcoinGUI::setClientModel(ClientModel *clientModel)
} else { } else {
// Disable possibility to show main window via action // Disable possibility to show main window via action
toggleHideAction->setEnabled(false); toggleHideAction->setEnabled(false);
if(trayIconMenu)
{
// Disable context menu on tray icon // Disable context menu on tray icon
trayIconMenu->clear(); trayIconMenu->clear();
} }
} }
}
#ifdef ENABLE_WALLET #ifdef ENABLE_WALLET
bool BitcoinGUI::addWallet(const QString& name, WalletModel *walletModel) bool BitcoinGUI::addWallet(const QString& name, WalletModel *walletModel)