[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [34541] trunk/blender/intern/ghost/intern/ GHOST_WindowWin32.cpp: Make version check more future proof.

Nathan Letwory nathan at letworyinteractive.com
Fri Jan 28 09:51:16 CET 2011


Revision: 34541
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=34541
Author:   jesterking
Date:     2011-01-28 08:51:15 +0000 (Fri, 28 Jan 2011)
Log Message:
-----------
Make version check more future proof.

Modified Paths:
--------------
    trunk/blender/intern/ghost/intern/GHOST_WindowWin32.cpp

Modified: trunk/blender/intern/ghost/intern/GHOST_WindowWin32.cpp
===================================================================
--- trunk/blender/intern/ghost/intern/GHOST_WindowWin32.cpp	2011-01-28 00:59:42 UTC (rev 34540)
+++ trunk/blender/intern/ghost/intern/GHOST_WindowWin32.cpp	2011-01-28 08:51:15 UTC (rev 34541)
@@ -149,12 +149,12 @@
 	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;
 		}
 	}




More information about the Bf-blender-cvs mailing list