From 037920caffe113c6ab9546ac426965fd5891e58c Mon Sep 17 00:00:00 2001
From: Nathan Letwory <nathan@letworyinteractive.com>
Date: Fri, 28 Jan 2011 08:51:15 +0000
Subject: Make version check more future proof.

---
 intern/ghost/intern/GHOST_WindowWin32.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'intern')

diff --git a/intern/ghost/intern/GHOST_WindowWin32.cpp b/intern/ghost/intern/GHOST_WindowWin32.cpp
index 11c6ab01287..7afd3fef832 100644
--- a/intern/ghost/intern/GHOST_WindowWin32.cpp
+++ b/intern/ghost/intern/GHOST_WindowWin32.cpp
@@ -149,12 +149,12 @@ GHOST_WindowWin32::GHOST_WindowWin32(
 	if(!GetVersionEx((OSVERSIONINFO *)&versionInfo)) {
 		versionInfo.dwOSVersionInfoSize = sizeof(OSVERSIONINFO);
 		if(GetVersionEx((OSVERSIONINFO*)&versionInfo)) {
-			if(versionInfo.dwMajorVersion>=6 && versionInfo.dwMinorVersion>=1) {
+			if((versionInfo.dwMajorVersion==6 && versionInfo.dwMinorVersion>=1) || versionInfo.dwMajorVersion >= 7) {
 				hasMinVersionForTaskbar = true;
 			}
 		}
 	} else {
-		if(versionInfo.dwMajorVersion>=6 && versionInfo.dwMinorVersion>=1) {
+		if((versionInfo.dwMajorVersion==6 && versionInfo.dwMinorVersion>=1) || versionInfo.dwMajorVersion >= 7) {
 			hasMinVersionForTaskbar = true;
 		}
 	}
-- 
cgit v1.2.3