am 38ed22eb: 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 '38ed22eb292f18f139f41b3b2bb87abcdd883c2d': Fix NPE in case where workspace is null because Launcher has been destroyed
2014-02-14 20:54:06 +00:00
parent 69c4dedd86 38ed22eb29
commit d8a11572d2
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();