From 5f8e3b97603fd523073f40f8737d9d5d5e90f00e Mon Sep 17 00:00:00 2001
From: Logan McNaughton <848146+loganmc10@users.noreply.github.com>
Date: Thu, 11 Jun 2026 21:16:06 +0200
Subject: [PATCH] run netplay_close on window close (#1061)

* run netplay_close on window close

* more
---
 src/lib.rs    | 5 ++++-
 src/ui/gui.rs | 6 +++++-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/lib.rs b/src/lib.rs
index cdd78d0..144b1b7 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -342,7 +342,10 @@ async fn android_main(app: slint::android::AndroidApp) {
                     && let Some(weak_app_window) = weak_app_window.as_ref()
                 {
                     weak_app_window
-                        .upgrade_in_event_loop(move |handle| ui::gui::save_settings(&handle))
+                        .upgrade_in_event_loop(move |handle| {
+                            ui::gui::save_settings(&handle);
+                            handle.invoke_netplay_close();
+                        })
                         .unwrap();
                 }
             }
diff --git a/src/ui/gui.rs b/src/ui/gui.rs
index 8a81c3a..e4254e3 100644
--- a/src/ui/gui.rs
+++ b/src/ui/gui.rs
@@ -535,11 +535,15 @@ pub fn app_window(app: &AppWindow, is_android: bool) {
         let weak_app = app.as_weak();
         app.window().on_close_requested(move || {
             weak_app
-                .upgrade_in_event_loop(move |handle| save_settings(&handle))
+                .upgrade_in_event_loop(move |handle| {
+                    save_settings(&handle);
+                    handle.invoke_netplay_close();
+                })
                 .unwrap();
             slint::CloseRequestResponse::HideWindow
         });
     }
+
     app.run().unwrap();
     retroachievements::shutdown_client();
 }