am 9710ec9d: am 060a4837: Merge "Fix NPE in case where workspace is null because Launcher has been destroyed " into jb-ub-now-jolly-elf

* commit '9710ec9d85566ea1edf973f3d51dda24f64bdaaf': Fix NPE in case where workspace is null because Launcher has been destroyed
2014-02-14 20:38:13 +00:00
parent fce34b2ff2 9710ec9d85
commit 38ed22eb29
1 changed files with 1 additions and 1 deletions
@@ -2664,7 +2664,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();