Merge branch 'master' into handle

StoneOrbits · Nov 10, 2024 · 817a88a · 817a88a
2 parents 648f931 + e7c4a88
commit 817a88a
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/VortexEngine/VortexCLI/VortexCLI.cpp b/VortexEngine/VortexCLI/VortexCLI.cpp
@@ -485,7 +485,7 @@ bool VortexCLI::init(int argc, char *argv[])
   }
 
   // do the vortex init/setup
-  Vortex::init<VortexCLICallbacks>();
+  Vortex::initEx<VortexCLICallbacks>();
 
   // configure the vortex engine as the parameters dictate
   Vortex::setInstantTimestep(m_noTimestep);
@@ -632,10 +632,10 @@ void VortexCLI::cleanup()
   }
   if (m_jsonMode & JSON_MODE_WRITE_STDOUT) {
     // dump the current save in json format
-    Vortex::dumpJson(nullptr, m_jsonPretty);
+    Vortex::printJson(m_jsonPretty);
   }
   if (m_jsonMode & JSON_MODE_WRITE_FILE) {
-    Vortex::dumpJson(m_jsonOutFile.c_str(), m_jsonPretty);
+    Vortex::printJsonToFile(m_jsonOutFile.c_str(), m_jsonPretty);
     printf("Wrote JSON to file [%s]\n", m_jsonOutFile.c_str());
   }
   if (m_writeSaveFile.length() > 0) {

diff --git a/VortexEngine/src/Menus/MenuList/EditorConnection.cpp b/VortexEngine/src/Menus/MenuList/EditorConnection.cpp
@@ -87,6 +87,7 @@ Menu::MenuAction EditorConnection::run()
   // operate on the state of the editor connection
   switch (m_state) {
   case STATE_DISCONNECTED:
+  default:
     // not connected yet so check for connections
     if (!SerialComs::isConnected()) {
       if (!SerialComs::checkSerial()) {