OSDN Git Service

* Fix NPE in LwjglCanvas.restoreCanvas()
authorShadowIsLord@gmail.com <ShadowIsLord@gmail.com@75d07b2b-3a1a-0410-a2c5-0572b91ccdca>
Fri, 29 Apr 2011 19:04:13 +0000 (19:04 +0000)
committerShadowIsLord@gmail.com <ShadowIsLord@gmail.com@75d07b2b-3a1a-0410-a2c5-0572b91ccdca>
Fri, 29 Apr 2011 19:04:13 +0000 (19:04 +0000)
git-svn-id: http://jmonkeyengine.googlecode.com/svn/trunk@7361 75d07b2b-3a1a-0410-a2c5-0572b91ccdca

engine/src/lwjgl-ogl/com/jme3/system/lwjgl/LwjglCanvas.java

index 77c8ef3..94d00fc 100644 (file)
@@ -227,12 +227,14 @@ public class LwjglCanvas extends LwjglAbstractDisplay implements JmeCanvasContex
             }
         }
         
-        renderer.resetGLObjects();
         logger.log(Level.INFO, "OGL: Creating display..");
 
         // Set renderable to true, since canvas is now displayable.
         renderable.set(true);
         createContext(settings);
+        
+        // must call after createContext, as renderer might be null
+        renderer.resetGLObjects();
 
         logger.log(Level.INFO, "OGL: Waiting for display to become active..");
         while (!Display.isCreated()){