From dabab7d1712a8a4af229f967fcb5d415bb2d4ac1 Mon Sep 17 00:00:00 2001
From: Takashi Sawanaka <sdottaka@users.sourceforge.net>
Date: Sun, 21 May 2017 22:13:52 +0900
Subject: [PATCH] ShellExtension: Fix stupid mistake in IsWindows8OrGreater()
 function

---
 ShellExtension/WinMergeShell.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ShellExtension/WinMergeShell.cpp b/ShellExtension/WinMergeShell.cpp
index 0df6ca65b..f92b805d9 100644
--- a/ShellExtension/WinMergeShell.cpp
+++ b/ShellExtension/WinMergeShell.cpp
@@ -111,7 +111,7 @@ bool IsWindows8OrGreater()
 {
 	OSVERSIONINFO ovi = { sizeof OSVERSIONINFO };
 	GetVersionEx(&ovi);
-	return (ovi.dwMajorVersion >= 6 && ovi.dwMinorVersion >= 2);
+	return (ovi.dwMajorVersion * 1000 + ovi.dwMinorVersion >= 6002);
 }
 
 class CWinMergeTempLocale
-- 
2.11.0