aboutsummaryrefslogtreecommitdiff
path: root/backends/taskbar
diff options
context:
space:
mode:
authorSupSuper2018-11-22 12:26:32 +0000
committerThierry Crozat2018-12-16 10:48:13 +0000
commit7bff9176d582c9c59a341d1a6fbe8ddb4f04e575 (patch)
treedd175b173633500d2e28c0899e190c6386a046c3 /backends/taskbar
parent61070f6ce0c15d3636f984c9aa00aa9c68cb25e1 (diff)
downloadscummvm-rg350-7bff9176d582c9c59a341d1a6fbe8ddb4f04e575.tar.gz
scummvm-rg350-7bff9176d582c9c59a341d1a6fbe8ddb4f04e575.tar.bz2
scummvm-rg350-7bff9176d582c9c59a341d1a6fbe8ddb4f04e575.zip
WIN32: Fix incorrect Windows version check
There's no point in testing for Windows 10 since the comparison is already "greater than or equals", and it identifies itself as 6.2 for backwards compatibility. Likely it was failing before because the return type was wrong. Version checks are unreliable anyways, should use feature checks, but "if it ain't broke don't fix it".
Diffstat (limited to 'backends/taskbar')
-rw-r--r--backends/taskbar/win32/win32-taskbar.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/backends/taskbar/win32/win32-taskbar.cpp b/backends/taskbar/win32/win32-taskbar.cpp
index 1537859243..f6706de72d 100644
--- a/backends/taskbar/win32/win32-taskbar.cpp
+++ b/backends/taskbar/win32/win32-taskbar.cpp
@@ -77,7 +77,7 @@ const PROPERTYKEY PKEY_Title = { /* fmtid = */ { 0xF29F85E0, 0x4FF9, 0x1068, { 0
Win32TaskbarManager::Win32TaskbarManager(SdlWindow_Win32 *window) : _window(window), _taskbar(NULL), _count(0), _icon(NULL) {
// Do nothing if not running on Windows 7 or later
- if (!Win32::confirmWindowsVersion(10, 0) && !Win32::confirmWindowsVersion(6, 1))
+ if (!Win32::confirmWindowsVersion(6, 1))
return;
CoInitialize(NULL);