sigonasr2/jmonkeyengine
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

- Fixed NPE when passing a null cursor to reset cursor to default.

Browse Source 
git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@10355 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
This commit is contained in:
dan..om 2013-02-06 22:05:32 +00:00
parent d729bbc43a
commit 94d036e58d
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
engine/src/lwjgl/com/jme3/input/lwjgl/LwjglMouseInput.java
View File

@ -153,14 +153,17 @@ public class LwjglMouseInput implements MouseInput {
public void setNativeCursor(JmeCursor jmeCursor) { public void setNativeCursor(JmeCursor jmeCursor) {
try { try {
Cursor newCursor = new Cursor( Cursor newCursor = null;
jmeCursor.getWidth(), if (jmeCursor != null) {
jmeCursor.getHeight(), newCursor = new Cursor(
jmeCursor.getXHotSpot(), jmeCursor.getWidth(),
jmeCursor.getYHotSpot(), jmeCursor.getHeight(),
jmeCursor.getNumImages(), jmeCursor.getXHotSpot(),
jmeCursor.getImagesData(), jmeCursor.getYHotSpot(),
jmeCursor.getImagesDelay()); jmeCursor.getNumImages(),
jmeCursor.getImagesData(),
jmeCursor.getImagesDelay());
}
Mouse.setNativeCursor(newCursor); Mouse.setNativeCursor(newCursor);
} catch (LWJGLException ex) { } catch (LWJGLException ex) {
Logger.getLogger(LwjglMouseInput.class.getName()).log(Level.SEVERE, null, ex); Logger.getLogger(LwjglMouseInput.class.getName()).log(Level.SEVERE, null, ex);