commit ab66ed2e067cbd1bc415b6cf66f3b5191b166461
author Joe Onorato <joeo@android.com> Fri Jun 11 10:54:31 2010 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Fri Jun 11 10:54:31 2010 -0700
tree c59b7b82f3d94632af7c0c3205a273422aff5302
parent d0afc87d9639a228b247cfbc2cf19d16132137b3
parent 790c2d9fc5931bca04e6d28a6ccec16e4aea2024

Merge "This variable can be checked outside the lock because it's only set from the ui thread." into froyo

src/com/android/launcher2/Launcher.java

diff --git a/src/com/android/launcher2/Launcher.java b/src/com/android/launcher2/Launcher.java
index 13a39a3..6bd915a 100644
--- a/src/com/android/launcher2/Launcher.java
+++ b/src/com/android/launcher2/Launcher.java
@@ -2093,7 +2093,11 @@
      * Implementation of the method from LauncherModel.Callbacks.
      */
     public int getCurrentWorkspaceScreen() {
-        return mWorkspace.getCurrentScreen();
+        if (mWorkspace != null) {
+            return mWorkspace.getCurrentScreen();
+        } else {
+            return SCREEN_COUNT / 2;
+        }
     }
 
     /**