aboutsummaryrefslogtreecommitdiff
path: root/src/qt/bitcoin.cpp
diff options
context:
space:
mode:
authorHennadii Stepanov <32963518+hebasto@users.noreply.github.com>2018-10-19 10:39:25 +0300
committerHennadii Stepanov <32963518+hebasto@users.noreply.github.com>2018-12-06 18:23:31 +0200
commit93009618b6d72b6bb253cabc4a5813d7aea18a67 (patch)
tree27629130101d2f04b03d1ad558d54018d89bfebe /src/qt/bitcoin.cpp
parentd387507aeca652a5569825af65243536f2ce26ea (diff)
downloadbitcoin-93009618b6d72b6bb253cabc4a5813d7aea18a67.tar.xz
Fix start with the `-min` option
When GUI starts with the `-min` option, the `Minimize to tray instead of the taskbar` option works as expected now.
Diffstat (limited to 'src/qt/bitcoin.cpp')
-rw-r--r--src/qt/bitcoin.cpp13
1 files changed, 6 insertions, 7 deletions
diff --git a/src/qt/bitcoin.cpp b/src/qt/bitcoin.cpp
index a014ad4b28..4a1576e88b 100644
--- a/src/qt/bitcoin.cpp
+++ b/src/qt/bitcoin.cpp
@@ -487,14 +487,13 @@ void BitcoinApplication::initializeResult(bool success)
}
#endif
- // If -min option passed, start window minimized.
- if(gArgs.GetBoolArg("-min", false))
- {
- window->showMinimized();
- }
- else
- {
+ // If -min option passed, start window minimized (iconified) or minimized to tray
+ if (!gArgs.GetBoolArg("-min", false)) {
window->show();
+ } else if (clientModel->getOptionsModel()->getMinimizeToTray() && window->hasTrayIcon()) {
+ // do nothing as the window is managed by the tray icon
+ } else {
+ window->showMinimized();
}
Q_EMIT splashFinished(window);