[Java-game-lib-cvs] SF.net SVN: java-game-lib: [2569] trunk/LWJGL/src/java/org/lwjgl/opengl/ WindowsDisplay.java

[<eli...@us...>]

Revision: 2569
          http://svn.sourceforge.net/java-game-lib/?rev=2569&view=rev
Author:   elias_naur
Date:     2006-09-08 01:29:16 -0700 (Fri, 08 Sep 2006)

Log Message:
-----------
Windows: Fixed NPE in Display.getVersion()

Modified Paths:
--------------
    trunk/LWJGL/src/java/org/lwjgl/opengl/WindowsDisplay.java

Modified: trunk/LWJGL/src/java/org/lwjgl/opengl/WindowsDisplay.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/opengl/WindowsDisplay.java	2006-09-01 20:15:05 UTC (rev 2568)
+++ trunk/LWJGL/src/java/org/lwjgl/opengl/WindowsDisplay.java	2006-09-08 08:29:16 UTC (rev 2569)
@@ -250,9 +250,10 @@
 		String driver = getAdapter();
 		if (driver != null) {
 			WindowsFileVersion version = nGetVersion(driver + ".dll");
-			return version.toString();
-		} else
-			return null;
+			if (version != null)
+				return version.toString();
+		}
+		return null;
 	}
 	private native WindowsFileVersion nGetVersion(String driver);
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.