Skip to content
Snippets Groups Projects
Commit 3f2fb53b authored by Vitaliy Vashchenko's avatar Vitaliy Vashchenko
Browse files

#398 fixed NPE when second touch is outside of the grid ,therefore touched actor is null.

parent 546495fd
Branches
Tags
No related merge requests found
......@@ -40,8 +40,8 @@ public class DragAndRotateActorListener extends InputListener {
private LinkedHashMap<Integer, Point> activePointers;
class Touch {
public static final float TIME_BETWEEN_TOUCHES = 100;
public static final float TIME_BETWEEN_TAPS = 600;
public static final float TIME_BETWEEN_TOUCHES = 100;
public static final float TIME_BETWEEN_TAPS = 700;
private long time;
private Actor touchedActor;
......@@ -64,10 +64,13 @@ public class DragAndRotateActorListener extends InputListener {
}
private boolean controlIfSame(Touch secondTouch, float time) {
return getTouchedActor().equals(secondTouch.getTouchedActor()) && Math.abs(secondTouch.getTime() - getTime()) < time;
if (getTouchedActor() != null && secondTouch.getTouchedActor() != null) {
return getTouchedActor().equals(secondTouch.getTouchedActor()) && Math.abs(secondTouch.getTime() - getTime()) < time;
} else {
return false;
}
}
public boolean isDoubleTap(Touch touch) {
return controlIfSame(touch, TIME_BETWEEN_TAPS);
}
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment