aboutsummaryrefslogtreecommitdiffstats
path: root/ardor3d-awt
diff options
context:
space:
mode:
authorJulien Gouesse <[email protected]>2018-01-27 16:40:51 +0100
committerJulien Gouesse <[email protected]>2018-01-27 16:40:51 +0100
commit484a7bc1b7354f80027e45d0fd0d97473cc454dd (patch)
tree8522c4fa7d8759c0b89d6bdf478a57469edb9642 /ardor3d-awt
parentb476eeed7ebee18a310ba02b3a740fe34b87cec2 (diff)
parent3725d8321774e80b84f302eb16089dde387822e1 (diff)
Merges several Renanse's commits
Diffstat (limited to 'ardor3d-awt')
-rw-r--r--ardor3d-awt/src/main/java/com/ardor3d/input/awt/AwtMouseManager.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/ardor3d-awt/src/main/java/com/ardor3d/input/awt/AwtMouseManager.java b/ardor3d-awt/src/main/java/com/ardor3d/input/awt/AwtMouseManager.java
index f126a5d..f820b9c 100644
--- a/ardor3d-awt/src/main/java/com/ardor3d/input/awt/AwtMouseManager.java
+++ b/ardor3d-awt/src/main/java/com/ardor3d/input/awt/AwtMouseManager.java
@@ -63,7 +63,7 @@ public class AwtMouseManager implements MouseManager {
@Override
public void setCursor(final MouseCursor cursor) {
- if (cursor == MouseCursor.SYSTEM_DEFAULT) {
+ if (cursor == MouseCursor.SYSTEM_DEFAULT || cursor == null) {
if (_grabbedState == GrabbedState.GRABBED) {
_pregrabCursor = Cursor.getPredefinedCursor(Cursor.DEFAULT_CURSOR);
} else {