From 37c717ffa626c6690ea45ba88e5dfc9bea39ed6e Mon Sep 17 00:00:00 2001
From: Adam Cohen <adamcohen@google.com>
Date: Tue, 26 Nov 2013 11:50:15 -0800
Subject: Fix NPE in case where workspace is null because Launcher has been
 destroyed

Bug: 11765964
Change-Id: Iacd4db712c09940c05ccd2a64b25e376b63c6aee
---
 src/com/android/launcher3/Launcher.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/com')

diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java
index 7d84a3c88..ce6b20e03 100644
--- a/src/com/android/launcher3/Launcher.java
+++ b/src/com/android/launcher3/Launcher.java
@@ -2663,7 +2663,7 @@ public class Launcher extends Activity
     }
 
     public void closeFolder() {
-        Folder folder = mWorkspace.getOpenFolder();
+        Folder folder = mWorkspace != null ? mWorkspace.getOpenFolder() : null;
         if (folder != null) {
             if (folder.isEditingName()) {
                 folder.dismissEditingName();
-- 
cgit v1.2.3