From 323e8cf1f0ff0f62523d4e9319ddb6574d60b158 Mon Sep 17 00:00:00 2001
From: Logan McNaughton <848146+loganmc10@users.noreply.github.com>
Date: Wed, 6 May 2026 10:59:05 +0200
Subject: [PATCH] move sdl quit calls (#842)

* move sdl quit calls

* more
---
 src/main.rs     | 4 +++-
 src/ui.rs       | 7 +++++++
 src/ui/gui.rs   | 1 -
 src/ui/input.rs | 2 --
 src/ui/video.rs | 2 --
 5 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/src/main.rs b/src/main.rs
index e0b558e..c488057 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -267,6 +267,8 @@ async fn main() -> std::io::Result<()> {
                 args.use_dinput,
                 args.deadzone.unwrap_or(ui::input::DEADZONE_DEFAULT),
             );
+
+            ui::sdl_close();
             return Ok(());
         }
         if args.list_controllers {
@@ -288,7 +290,6 @@ async fn main() -> std::io::Result<()> {
                 ui::input::bind_input_profile(&mut config, profile, port);
             }
         }
-        unsafe { sdl3_sys::init::SDL_Quit() };
     } else {
         #[cfg(feature = "gui")]
         {
@@ -298,5 +299,6 @@ async fn main() -> std::io::Result<()> {
         }
     }
 
+    ui::sdl_close();
     Ok(())
 }
diff --git a/src/ui.rs b/src/ui.rs
index d4dd832..6df498e 100644
--- a/src/ui.rs
+++ b/src/ui.rs
@@ -108,6 +108,13 @@ pub fn ttf_init() {
     }
 }
 
+pub fn sdl_close() {
+    unsafe {
+        sdl3_ttf_sys::ttf::TTF_Quit();
+        sdl3_sys::init::SDL_Quit();
+    }
+}
+
 pub fn get_dirs() -> Dirs {
     let exe_path = std::env::current_exe().unwrap();
     let portable_dir = exe_path.parent();
diff --git a/src/ui/gui.rs b/src/ui/gui.rs
index 322a2c1..f45e57b 100644
--- a/src/ui/gui.rs
+++ b/src/ui/gui.rs
@@ -515,7 +515,6 @@ pub fn app_window() {
     ui::cheats::cheats_window(&app);
     app.run().unwrap();
     save_settings(&app);
-    unsafe { sdl3_sys::init::SDL_Quit() };
 }
 
 pub fn run_rom(
diff --git a/src/ui/input.rs b/src/ui/input.rs
index 23bd1fc..4bcad52 100644
--- a/src/ui/input.rs
+++ b/src/ui/input.rs
@@ -608,8 +608,6 @@ fn close_input_profile_window(
         sdl3_ttf_sys::ttf::TTF_DestroyRendererTextEngine(text_engine);
         sdl3_sys::render::SDL_DestroyRenderer(renderer);
         sdl3_sys::video::SDL_DestroyWindow(window);
-        sdl3_ttf_sys::ttf::TTF_Quit();
-        sdl3_sys::init::SDL_Quit();
     }
 }
 
diff --git a/src/ui/video.rs b/src/ui/video.rs
index b8f0eb3..2bd5386 100644
--- a/src/ui/video.rs
+++ b/src/ui/video.rs
@@ -150,8 +150,6 @@ pub fn close(ui: &ui::Ui) {
     unsafe {
         rdp_close();
         sdl3_sys::video::SDL_DestroyWindow(ui.video.window);
-        sdl3_ttf_sys::ttf::TTF_Quit();
-        sdl3_sys::init::SDL_Quit();
     }
 }