From c4adba40dd56e9462ac313d2cc7ff6d082d0b41d Mon Sep 17 00:00:00 2001
From: Craig Drummond <craig.p.drummond@gmail.com>
Date: Thu, 4 Feb 2016 23:06:51 +0000
Subject: [PATCH] nly honour 'startHidden' setting if also configured to use
 system tray.

---
 ChangeLog        | 1 +
 gui/settings.cpp | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 9b9a13408..17a358c12 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -17,6 +17,7 @@
 5. Install pre-rendered PNG icons for Linux builds.
 6. Use last.fm 2.0 API for finding similar artists in dynamic playlists.
 7. Fix listing of CUE files.
+8. Only honour 'startHidden' setting if also configured to use system tray.
 
 2.0.0
 -----
diff --git a/gui/settings.cpp b/gui/settings.cpp
index 278014615..4bad85f0d 100644
--- a/gui/settings.cpp
+++ b/gui/settings.cpp
@@ -566,7 +566,7 @@ bool Settings::forceSingleClick()
 
 bool Settings::startHidden()
 {
-    return cfg.get("startHidden", false);
+    return useSystemTray() ? cfg.get("startHidden", false) : false;
 }
 
 bool Settings::showTimeRemaining()