From d0afc87d9639a228b247cfbc2cf19d16132137b3 Mon Sep 17 00:00:00 2001
From: Joe Onorato <joeo@android.com>
Date: Fri, 11 Jun 2010 00:03:15 -0700
Subject: Fix crash in getCurrentWorkspaceScreen.

Bug 2761789

Change-Id: I9f005c876ca20f774e6d8046e34451a7fecbe805
---
 src/com/android/launcher2/Launcher.java | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'src/com/android/launcher2/Launcher.java')

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