Version 2.1.7. Corrected an exception when starting with the GUI hidden.

nasa · Feb 22, 2024 · 5ef4289 · 5ef4289
1 parent 4a4d748
commit 5ef4289
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git a/CCDD.jar b/CCDD.jar
diff --git a/ccdd.build.number b/ccdd.build.number
@@ -1,3 +1,3 @@
 #Build Number for ANT. Do not edit!
-#Wed Jan 31 14:37:33 CST 2024
-build.number=7
+#Thu Feb 22 09:22:50 CST 2024
+build.number=8
diff --git a/src/CCDD/CcddMain.java b/src/CCDD/CcddMain.java
@@ -421,15 +421,19 @@ protected CcddMain(String[] args)
                 // target database)
                 String projectName = dbControl.getProjectName();
 
+                // Store the command line handler reference. Opening the database sets the
+                // reference to null; however, the handler is needed again below
+                CcddCommandLineHandler tempCmdLnHandler = cmdLnHandler;
+
                 // Open the specified database and execute post-opening command line commands. Set
                 // the error flag if no database can be opened (including the default), or if the
                 // default database was successfully opened but was not the database specified
                 // (failure to open a database results in the default being opened)
                 boolean errorFlag = dbControl.openDatabase(projectName)
-                                    || !projectName.equals(DEFAULT_DATABASE);
+                                    || !projectName.equalsIgnoreCase(dbControl.getProjectName());
 
                 // Perform any clean-up steps and exit the application
-                cmdLnHandler.postCommandCleanUp(errorFlag ? 1 : 0);
+                tempCmdLnHandler.postCommandCleanUp(errorFlag ? 1 : 0);
             }
         }