commit e498ab9986cf0d3f2d7bc1511d80134427ad2303
author Android (Google) Code Review <android-gerrit@google.com> Fri Sep 11 20:31:23 2009 -0400
committer Android (Google) Code Review <android-gerrit@google.com> Fri Sep 11 20:31:23 2009 -0400
tree 87c40dc96087f05391d82b3ef1dc63993e183e7d
parent 3c8b90d9eb149aae593c726893eb560900f302ab
parent 52d9cb32608e7c3d065b4fb8e97269e238f1683e

Merge change 24807 into eclair

* changes:
  Fix a drag and drop issue: if a drop happened too quickly it could go to the wrong screen.

src/com/android/launcher2/LauncherModel.java

diff --git a/src/com/android/launcher2/LauncherModel.java b/src/com/android/launcher2/LauncherModel.java
index b261a75..fae1d17 100644
--- a/src/com/android/launcher2/LauncherModel.java
+++ b/src/com/android/launcher2/LauncherModel.java
@@ -310,7 +310,7 @@
                 mAllAppsList.modified = new ArrayList();
             }
 
-            final Callbacks callbacks = mCallbacks.get();
+            final Callbacks callbacks = mCallbacks != null ? mCallbacks.get() : null;
             if (callbacks == null) {
                 return;
             }