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

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

Revision: 3112
          http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3112&view=rev
Author:   elias_naur
Date:     2008-08-12 17:05:26 +0000 (Tue, 12 Aug 2008)

Log Message:
-----------
Linux: Avoid unneccessary mode switching in LinuxDisplay.resetDisplayMode (patch by buggs)

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

Modified: trunk/LWJGL/src/java/org/lwjgl/opengl/LinuxDisplay.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/opengl/LinuxDisplay.java	2008-08-12 12:53:03 UTC (rev 3111)
+++ trunk/LWJGL/src/java/org/lwjgl/opengl/LinuxDisplay.java	2008-08-12 17:05:26 UTC (rev 3112)
@@ -548,7 +548,8 @@
 	public void resetDisplayMode() {
 		lockAWT();
 		try {
-			switchDisplayMode(saved_mode);
+			if(current_mode != saved_mode)
+				switchDisplayMode(saved_mode);
 			if (isXF86VidModeSupported())
 				doSetGamma(saved_gamma);
 		} catch (LWJGLException e) {
@@ -645,7 +646,7 @@
 			current_mode = saved_mode;
 			saved_gamma = getCurrentGammaRamp();
 			current_gamma = saved_gamma;
-			return saved_mode;
+			return current_mode;
 		} finally {
 			unlockAWT();
 		}


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