Fixed #553 (#554)

bowring · web-flow · commit ed6e8b305245 · 2021-01-13T11:00:00.000-05:00
diff --git a/squidApp/src/main/java/org/cirdles/squid/gui/squidReportTable/SquidReportSettingsController.java b/squidApp/src/main/java/org/cirdles/squid/gui/squidReportTable/SquidReportSettingsController.java
@@ -1020,9 +1020,11 @@ private List<SquidReportTableInterface> getTables() {
         } else {
             defaultLabDataRT = Task.squidLabData.getDefaultReportTable();
             // backwards fix
-            if (defaultLabDataRT.getReportTableName().toUpperCase().startsWith("BUILTIN")) {
-                defaultLabDataRT = null;
-                Task.squidLabData.setDefaultReportTable(null);
+            if (defaultLabDataRT != null) {
+                if (defaultLabDataRT.getReportTableName().toUpperCase().startsWith("BUILTIN")) {
+                    defaultLabDataRT = null;
+                    Task.squidLabData.setDefaultReportTable(null);
+                }
             }
         }
 

Original file line number	Diff line number	Diff line change
`@@ -1020,9 +1020,11 @@ private List<SquidReportTableInterface> getTables() {`
`1020`	`1020`	`} else {`
`1021`	`1021`	`defaultLabDataRT = Task.squidLabData.getDefaultReportTable();`
`1022`	`1022`	`// backwards fix`
`1023`		`- if (defaultLabDataRT.getReportTableName().toUpperCase().startsWith("BUILTIN")) {`
`1024`		`- defaultLabDataRT = null;`
`1025`		`- Task.squidLabData.setDefaultReportTable(null);`
	`1023`	`+ if (defaultLabDataRT != null) {`
	`1024`	`+ if (defaultLabDataRT.getReportTableName().toUpperCase().startsWith("BUILTIN")) {`
	`1025`	`+ defaultLabDataRT = null;`
	`1026`	`+ Task.squidLabData.setDefaultReportTable(null);`
	`1027`	`+ }`
`1026`	`1028`	`}`
`1027`	`1029`	`}`
`1028`	`1030`