From 2eb8a0dc1d898808ec090a684f3ef9e1165ec398 Mon Sep 17 00:00:00 2001
From: Logan McNaughton <848146+loganmc10@users.noreply.github.com>
Date: Wed, 20 May 2026 10:34:33 +0200
Subject: [PATCH] move save_settings into callback (#925)

---
 src/ui/gui.rs | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/ui/gui.rs b/src/ui/gui.rs
index ed209cc..ffc7969 100644
--- a/src/ui/gui.rs
+++ b/src/ui/gui.rs
@@ -521,8 +521,15 @@ pub fn app_window(is_android: bool) {
     }
     ui::netplay::netplay_window(&app);
     ui::cheats::cheats_window(&app);
+
+    let weak_app = app.as_weak();
+    app.window().on_close_requested(move || {
+        weak_app
+            .upgrade_in_event_loop(move |handle| save_settings(&handle))
+            .unwrap();
+        slint::CloseRequestResponse::HideWindow
+    });
     app.run().unwrap();
-    save_settings(&app);
 }
 
 pub fn run_rom(