diff options
| author | Stefan Hacker <dd0t@users.sourceforge.net> | 2013-01-14 23:37:18 +0400 |
|---|---|---|
| committer | Stefan Hacker <dd0t@users.sourceforge.net> | 2013-01-14 23:37:18 +0400 |
| commit | 6d67d07e587afcd51739ec7636e37dab30311177 (patch) | |
| tree | e2a1f5c291bf0d64eb24d383de052720a1b941b8 | |
| parent | 8678a0c37ed369fb1d65e75137f7b215940ba650 (diff) | |
Default disable hide in tray also for Windows 81.2.4-rc1
* Can't use os_win.cpp versioning code as global settings singleton
is initialized before os_init() routine populates variables.
* For now went with the option with least code impact. This should
be revisited after release.
| -rw-r--r-- | src/mumble/Settings.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/mumble/Settings.cpp b/src/mumble/Settings.cpp index 188148e0a..b5f57d280 100644 --- a/src/mumble/Settings.cpp +++ b/src/mumble/Settings.cpp @@ -306,8 +306,9 @@ Settings::Settings() { aotbAlwaysOnTop = OnTopNever; bAskOnQuit = true; #ifdef Q_OS_WIN - // Don't enable minimize to tray by default on win7 - bHideInTray = (QSysInfo::windowsVersion() != QSysInfo::WV_6_1); + // Don't enable minimize to tray by default on Windows 7 or Windows 8 + const QSysInfo::WinVersion winVer = QSysInfo::windowsVersion(); + bHideInTray = (winVer != QSysInfo::WV_WINDOWS7 && winVer != QSysInfo::WV_WINDOWS8); #else bHideInTray = true; #endif |