Fix NPE when switching projects

Change-Id: Ie2bf23e58047bb19d6e0ae289f4021940f1b8324

Fix NPE when switching projects
Change-Id: Ie2bf23e58047bb19d6e0ae289f4021940f1b8324
712d970e · Evan W. Patton · Jeffrey Schiller · 7185f2cb · 712d970e
Commit 712d970e authored Dec 11, 2019 by Evan W. Patton Committed by Jeffrey Schiller Dec 12, 2019
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 1 deletion

appinventor/appengine/src/com/google/appinventor/client/Ode.java ...ntor/appengine/src/com/google/appinventor/client/Ode.java +3 -1

No files found.
--- a/appinventor/appengine/src/com/google/appinventor/client/Ode.java
+++ b/appinventor/appengine/src/com/google/appinventor/client/Ode.java
@@ -1563,7 +1563,9 @@ public class Ode implements EntryPoint {
   * HideChaff when switching view from block to others
   */
  private void hideChaff() {
-    if (designToolbar.getCurrentView() == DesignToolbar.View.BLOCKS) {
+    if (designToolbar.getCurrentView() == DesignToolbar.View.BLOCKS
+        // currentFileEditor may be null when switching projects
+        && currentFileEditor != null) {
      currentFileEditor.hideChaff();
    }
  }