Merge branch 'skmp/fix-vjoy-osd' into alpha

Fixes (VJOY Edit, System Reboot, GL Resize, SH4::Stop on fb roms)

Author: skmp

libswirl/gui/gui.cpp

@@ -51,6 +51,7 @@
 #include "hw/maple/maple_if.h"
 
 #include "libswirl.h"
+#include "gui/gui_renderer.h"
 
 bool game_started;
 
@@ -363,14 +364,13 @@ struct ReicastUI_impl : GUI {
             if (!game_file.empty())
             {
                 if (gui_start_game(game_file))
-                    gui_state = ClosedNoResume;
+                    gui_state = Closed;
             }
             else
                 gui_render_content();
         }
         break;
         case Closed:
-        case ClosedNoResume:
             break;
         case Onboarding:
             gui_render_onboarding();
@@ -384,7 +384,7 @@ struct ReicastUI_impl : GUI {
             break;
         }
 
-        if (gui_state == ClosedNoResume)
+        if (gui_state == Closed)
             gui_state = Closed;
     }
 
@@ -924,7 +924,7 @@ struct ReicastUI_impl : GUI {
             {
                 cfgSetVirtual("config", "image", "");
                 if (gui_start_game(""))
-                    gui_state = ClosedNoResume;
+                    gui_state = Closed;
             }
             ImGui::PopID();
 #endif
@@ -939,7 +939,7 @@ struct ReicastUI_impl : GUI {
                     if (ImGui::Selectable(game.name.c_str()))
                     {
                         if (gui_start_game(game.path))
-                            gui_state = ClosedNoResume;
+                            gui_state = Closed;
                     }
                     ImGui::PopID();
                 }

libswirl/gui/gui_partials.h

@@ -43,6 +43,6 @@ extern f32 mo_wheel_delta;
 
 extern int screen_dpi;
 
-typedef enum { Welcome, Closed, Commands, Settings, ClosedNoResume, Main, Onboarding, VJoyEdit, VJoyEditCommands } GuiState;
+typedef enum { Welcome, Closed, Commands, Settings, Main, Onboarding, VJoyEdit, VJoyEditCommands } GuiState;
 extern GuiState gui_state;
 void ImGui_Impl_NewFrame();