aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWladimir J. van der Laan <laanwj@gmail.com>2018-10-16 06:51:28 +0200
committerWladimir J. van der Laan <laanwj@gmail.com>2018-10-16 06:54:07 +0200
commit9bd3ff430b4e4e862b319a899825c51f3d18285e (patch)
treea22202cc7ffed59d91e9ee0833a63d84f8e83804
parent2a2cac787360e80ec1aeba58b54d03ff81f5d20f (diff)
parent36323e2ac6cca134de47b06c3f6403de91ee9eda (diff)
downloadbitcoin-9bd3ff430b4e4e862b319a899825c51f3d18285e.tar.xz
Merge #14383: qt: Clean system tray icon menu for '-disablewallet' mode
36323e2ac6cca134de47b06c3f6403de91ee9eda Clean systray icon menu for -disablewallet mode (Hennadii Stepanov) Pull request description: There is a `Debug window` leftover in the system tray icon menu after #3392 merging. This PR makes both the app menu and the systray icon menu consistent. Tree-SHA512: c9ef58785fe2a54bc6f778140a16001748ed8c46da948656822b86fdc2e224203cd467857f71d00ce56fc73ff2590c46d8c234a54c261c1141d83039de6fee1e
-rw-r--r--src/qt/bitcoingui.cpp16
1 files changed, 9 insertions, 7 deletions
diff --git a/src/qt/bitcoingui.cpp b/src/qt/bitcoingui.cpp
index 51aff08c42..311841017f 100644
--- a/src/qt/bitcoingui.cpp
+++ b/src/qt/bitcoingui.cpp
@@ -620,14 +620,16 @@ void BitcoinGUI::createTrayIconMenu()
trayIconMenu->addAction(toggleHideAction);
trayIconMenu->addSeparator();
#endif
- trayIconMenu->addAction(sendCoinsMenuAction);
- trayIconMenu->addAction(receiveCoinsMenuAction);
- trayIconMenu->addSeparator();
- trayIconMenu->addAction(signMessageAction);
- trayIconMenu->addAction(verifyMessageAction);
- trayIconMenu->addSeparator();
+ if (enableWallet) {
+ trayIconMenu->addAction(sendCoinsMenuAction);
+ trayIconMenu->addAction(receiveCoinsMenuAction);
+ trayIconMenu->addSeparator();
+ trayIconMenu->addAction(signMessageAction);
+ trayIconMenu->addAction(verifyMessageAction);
+ trayIconMenu->addSeparator();
+ trayIconMenu->addAction(openRPCConsoleAction);
+ }
trayIconMenu->addAction(optionsAction);
- trayIconMenu->addAction(openRPCConsoleAction);
#ifndef Q_OS_MAC // This is built-in on Mac
trayIconMenu->addSeparator();
trayIconMenu->addAction(quitAction);