java-game-lib-cvs Mailing List for Lightweight Java Game Library

Update of /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/opengl
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14704/src/java/org/lwjgl/opengl

Modified Files:
	LinuxDisplay.java 
Log Message:
Linux: try to work around crash on opengl library unload

Index: LinuxDisplay.java
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/opengl/LinuxDisplay.java,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- LinuxDisplay.java	25 Apr 2005 07:26:07 -0000	1.24
+++ LinuxDisplay.java	25 Apr 2005 07:47:28 -0000	1.25
@@ -66,6 +66,7 @@
 	 */
 	static void incDisplay() throws LWJGLException {
 		if (display_connection_usage_count == 0) {
+			GLContext.loadOpenGLLibrary();
 			openDisplay();
 		}
 		display_connection_usage_count++;
@@ -77,6 +78,7 @@
 			throw new InternalError("display_connection_usage_count < 0: " + display_connection_usage_count);
 		if (display_connection_usage_count == 0) {
 			closeDisplay();
+			GLContext.unloadOpenGLLibrary();	
 		}
 	}
 

Update of /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/opengl
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3158/src/java/org/lwjgl/opengl

Modified Files:
	LinuxDisplay.java 
Log Message:
Linux: Fixed crash

Index: LinuxDisplay.java
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/opengl/LinuxDisplay.java,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- LinuxDisplay.java	12 Apr 2005 11:45:06 -0000	1.23
+++ LinuxDisplay.java	25 Apr 2005 07:26:07 -0000	1.24
@@ -306,17 +306,33 @@
 	
 	public int getMinCursorSize() {
 		lockAWT();
-		int min_size = nGetMinCursorSize();
-		unlockAWT();
-		return min_size;
+		try {
+			incDisplay();
+			int min_size = nGetMinCursorSize();
+			decDisplay();
+			return min_size;
+		} catch (LWJGLException e) {
+			LWJGLUtil.log("Exception occurred in getMinCursorSize: " + e);
+			return 0;
+		} finally {
+			unlockAWT();
+		}
 	}
 	private static native int nGetMinCursorSize();
 
 	public int getMaxCursorSize() {
 		lockAWT();
-		int max_size = nGetMaxCursorSize();
-		unlockAWT();
-		return max_size;
+		try {
+			incDisplay();
+			int max_size = nGetMaxCursorSize();
+			decDisplay();
+			return max_size;
+		} catch (LWJGLException e) {
+			LWJGLUtil.log("Exception occurred in getMaxCursorSize: " + e);
+			return 0;
+		} finally {
+			unlockAWT();
+		}
 	}
 	private static native int nGetMaxCursorSize();