From 9c7c508e0d795e425833d013de64b9bdb147418f Mon Sep 17 00:00:00 2001
From: mark van tilburg <markvantilburg@gmail.com>
Date: Fri, 31 Jul 2026 11:56:33 +0200
Subject: [PATCH] Simplify display setup to always use GUI mode

Refactor display setup logic to always start in GUI mode, and re-evaluate state after loading ROM.

Fixes #52
---
 meka/srcs/meka.cpp | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/meka/srcs/meka.cpp b/meka/srcs/meka.cpp
index e99f0c7c..f3c478f8 100644
--- a/meka/srcs/meka.cpp
+++ b/meka/srcs/meka.cpp
@@ -409,11 +409,8 @@ int main(int argc, char **argv)
     if (!g_config.loaded_configuration_file)
         Configuration_Save();
 
-    // Setup display (fullscreen/GUI)
-    if ((g_machine_flags & MACHINE_RUN) == MACHINE_RUN && !g_config.start_in_gui)
-        g_env.state = MEKA_STATE_GAME;
-    else
-        g_env.state = MEKA_STATE_GUI;
+    // Setup display (GUI-mode)
+    g_env.state = MEKA_STATE_GUI;
     Video_Setup_State();
 
     Machine_Reset          (); // Reset Emulated Machine (set default values)
@@ -422,7 +419,15 @@ int main(int argc, char **argv)
 
     // Load ROM from command line if necessary
     Load_ROM_Command_Line();
-
+    
+    // Re-evaluate startup display state after loading ROM from command-line.
+    // This allows start_in_gui = 0 to take effect if a ROM was loaded at startup.
+    if (!g_config.start_in_gui && (g_machine_flags & MACHINE_RUN) == MACHINE_RUN)
+    {
+        g_env.state = MEKA_STATE_GAME;
+        Video_Setup_State();
+    }
+    
     // Wait for Win32 console signal
     if (!ConsoleWaitForAnswer(true))
         return (0);