Merge branch 'master' into handle

StoneOrbits · Aug 21, 2024 · 9df6f82 · 9df6f82
2 parents caacbbe + 3d4fcb6
commit 9df6f82
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 0 deletions.
diff --git a/VortexEngine/src/Menus/Menus.cpp b/VortexEngine/src/Menus/Menus.cpp
@@ -105,6 +105,14 @@ bool Menus::runMenuSelection()
   if (g_pButton->onShortClick()) {
     // otherwise increment selection and wrap around at num menus
     m_selection = (m_selection + 1) % NUM_MENUS;
+#if ENABLE_EDITOR_CONNECTION == 1
+    // Hide the editor connection menu because it opens automatically
+    // TODO: Create a better way to hide this menu color, this menu
+    //       will automatically open when the device is plugged in
+    if (m_selection == MENU_EDITOR_CONNECTION) {
+      m_selection++;
+    }
+#endif
     DEBUG_LOGF("Cyling to ring menu %u", m_selection);
     // reset the open time so that it starts again
     m_openTime = Time::getCurtime();

diff --git a/VortexEngine/tests/tests_general.tar.gz b/VortexEngine/tests/tests_general.tar.gz