From 4f322eed61667dbe6db91df7a48055a87fb76ee4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= Date: Sun, 25 Oct 2026 13:44:44 +0100 Subject: [PATCH] UI: Start normally when --start-screen names an unknown screen It left no screen at all, just a log full of "No current screen!". Co-Authored-By: Claude Opus 5.5 (1M context) --- UI/NativeApp.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/UI/NativeApp.cpp b/UI/NativeApp.cpp index 3aac594438..8dc508d686 100644 --- a/UI/NativeApp.cpp +++ b/UI/NativeApp.cpp @@ -891,12 +891,14 @@ void NativeInit(int argc, const char *argv[], const CommandLineOptions &cmdLineO if (equals(cmdLineOptions.startScreen.value(), "touchscreentest")) { g_screenManager->switchScreen(new MainScreen()); g_screenManager->push(new TouchTestScreen(Path())); - } - if (equals(cmdLineOptions.startScreen.value(), "gamesettings")) { + } else if (equals(cmdLineOptions.startScreen.value(), "gamesettings")) { g_screenManager->switchScreen(new LogoScreen(AfterLogoScreen::TO_GAME_SETTINGS)); } else if (equals(cmdLineOptions.startScreen.value(), "developertools")) { g_screenManager->switchScreen(new MainScreen()); g_screenManager->push(new DeveloperToolsScreen(Path())); + } else { + WARN_LOG(Log::System, "Unknown start screen '%s'", cmdLineOptions.startScreen.value().c_str()); + g_screenManager->switchScreen(new LogoScreen(AfterLogoScreen::DEFAULT)); } } else if (skipLogo && !boot_filename.empty()) { INFO_LOG(Log::System, "Launching EmuScreen with boot filename '%s'", boot_filename.c_str());