From f30801afbde7598318a5b03de9812c58a6a34f33 Mon Sep 17 00:00:00 2001 From: "Wladimir J. van der Laan" Date: Tue, 26 Aug 2014 17:44:57 +0200 Subject: [PATCH] qt: Add null check in setClientModel(0) Don't clear tray icon menu if it was never created. Necessary precaution after #4649. --- src/qt/bitcoingui.cpp | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/qt/bitcoingui.cpp b/src/qt/bitcoingui.cpp index 68d42ce64..790301a1e 100644 --- a/src/qt/bitcoingui.cpp +++ b/src/qt/bitcoingui.cpp @@ -455,8 +455,11 @@ void BitcoinGUI::setClientModel(ClientModel *clientModel) } else { // Disable possibility to show main window via action toggleHideAction->setEnabled(false); - // Disable context menu on tray icon - trayIconMenu->clear(); + if(trayIconMenu) + { + // Disable context menu on tray icon + trayIconMenu->clear(); + } } }