Merge pull request #4596 from JakubValtar/master

benfry · web-flow · commit 21900a82c197 · 2016-08-01T11:08:01.000-04:00
Prevent NPEs when tab document is null
diff --git a/app/src/processing/app/ui/Editor.java b/app/src/processing/app/ui/Editor.java
@@ -1371,10 +1371,13 @@ public void actionPerformed(ActionEvent e) {
       redoAction.updateRedoState();
       if (sketch != null) {
         sketch.setModified(!getText().equals(sketch.getCurrentCode().getSavedProgram()));
+        // Go through all tabs; Replace All, Rename or Undo could have changed them
         for (SketchCode sc : sketch.getCode()) {
-          try {
-            sc.setModified(!sc.getDocumentText().equals(sc.getSavedProgram()));
-          } catch (BadLocationException ignore) { }
+          if (sc.getDocument() != null) {
+            try {
+              sc.setModified(!sc.getDocumentText().equals(sc.getSavedProgram()));
+            } catch (BadLocationException ignore) { }
+          }
         }
         repaintHeader();
       }
@@ -1433,10 +1436,14 @@ public void actionPerformed(ActionEvent e) {
       undoAction.updateUndoState();
       if (sketch != null) {
         sketch.setModified(!getText().equals(sketch.getCurrentCode().getSavedProgram()));
+        // Go through all tabs; Replace All, Rename or Undo could have changed them
         for (SketchCode sc : sketch.getCode()) {
-          try {
-            sc.setModified(!sc.getDocumentText().equals(sc.getSavedProgram()));
-          } catch (BadLocationException ignore) { }
+          if (sc.getDocument() != null) {
+            try {
+              sc.setModified(!sc.getDocumentText().equals(sc.getSavedProgram()));
+            } catch (BadLocationException ignore) {
+            }
+          }
         }
         repaintHeader();
       }
@@ -2717,10 +2724,14 @@ public void prepareRun() {
 
     // make sure any edits have been stored
     //current.setProgram(editor.getText());
+    // Go through all tabs; Replace All, Rename or Undo could have changed them
     for (SketchCode sc : sketch.getCode()) {
-      try {
-        sc.setProgram(sc.getDocumentText());
-      } catch (BadLocationException e) { }
+      if (sc.getDocument() != null) {
+        try {
+          sc.setProgram(sc.getDocumentText());
+        } catch (BadLocationException e) {
+        }
+      }
     }
 
 //    // if an external editor is being used, need to grab the
