From 94d036e58d9c38e029e6f43b4d5b6e7cc153c2c1 Mon Sep 17 00:00:00 2001 From: "dan..om" Date: Wed, 6 Feb 2013 22:05:32 +0000 Subject: [PATCH] - Fixed NPE when passing a null cursor to reset cursor to default. git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@10355 75d07b2b-3a1a-0410-a2c5-0572b91ccdca --- .../com/jme3/input/lwjgl/LwjglMouseInput.java | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/engine/src/lwjgl/com/jme3/input/lwjgl/LwjglMouseInput.java b/engine/src/lwjgl/com/jme3/input/lwjgl/LwjglMouseInput.java index e5afe35a4..a91aab36e 100644 --- a/engine/src/lwjgl/com/jme3/input/lwjgl/LwjglMouseInput.java +++ b/engine/src/lwjgl/com/jme3/input/lwjgl/LwjglMouseInput.java @@ -153,14 +153,17 @@ public class LwjglMouseInput implements MouseInput { public void setNativeCursor(JmeCursor jmeCursor) { try { - Cursor newCursor = new Cursor( - jmeCursor.getWidth(), - jmeCursor.getHeight(), - jmeCursor.getXHotSpot(), - jmeCursor.getYHotSpot(), - jmeCursor.getNumImages(), - jmeCursor.getImagesData(), - jmeCursor.getImagesDelay()); + Cursor newCursor = null; + if (jmeCursor != null) { + newCursor = new Cursor( + jmeCursor.getWidth(), + jmeCursor.getHeight(), + jmeCursor.getXHotSpot(), + jmeCursor.getYHotSpot(), + jmeCursor.getNumImages(), + jmeCursor.getImagesData(), + jmeCursor.getImagesDelay()); + } Mouse.setNativeCursor(newCursor); } catch (LWJGLException ex) { Logger.getLogger(LwjglMouseInput.class.getName()).log(Level.SEVERE, null, ex);