diff options
author | Tom Hennen <TomHennen@users.noreply.github.com> | 2015-06-16 20:17:04 -0400 |
---|---|---|
committer | Tom Hennen <TomHennen@users.noreply.github.com> | 2015-06-16 20:17:04 -0400 |
commit | ec4ed747b6de9ab98d3ad31a0256a77b8e8cc25c (patch) | |
tree | 7dfa03fff2e7a7a9fc0d32b74e313668e9b6bcb2 /library/drag-sort-listview/src/main/java/com/mobeta/android/dslv | |
parent | f88c80cced6c3b529a6ef1addafaa930fb41d58f (diff) | |
parent | 3d102449bc2bf78b6c5645ee738e6658c9cb155f (diff) | |
download | AntennaPod-ec4ed747b6de9ab98d3ad31a0256a77b8e8cc25c.zip |
Merge pull request #881 from AntennaPod/develop1.2
Release of 1.2
Diffstat (limited to 'library/drag-sort-listview/src/main/java/com/mobeta/android/dslv')
-rw-r--r-- | library/drag-sort-listview/src/main/java/com/mobeta/android/dslv/DragSortController.java | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/library/drag-sort-listview/src/main/java/com/mobeta/android/dslv/DragSortController.java b/library/drag-sort-listview/src/main/java/com/mobeta/android/dslv/DragSortController.java index 6acf6b42e..fef853d22 100644 --- a/library/drag-sort-listview/src/main/java/com/mobeta/android/dslv/DragSortController.java +++ b/library/drag-sort-listview/src/main/java/com/mobeta/android/dslv/DragSortController.java @@ -378,6 +378,12 @@ public class DragSortController extends SimpleFloatViewManager implements View.O @Override public boolean onScroll(MotionEvent e1, MotionEvent e2, float distanceX, float distanceY) { + // it can happen where the motion events are null + if (e1 == null || e2 == null) { + // we can't really do anything + return false; + } + final int x1 = (int) e1.getX(); final int y1 = (int) e1.getY(); final int x2 = (int) e2.getX(); |