From 43ebc37f877d276788704db2e268947af1f51765 Mon Sep 17 00:00:00 2001
From: Logan McNaughton <848146+loganmc10@users.noreply.github.com>
Date: Sat, 23 May 2026 09:31:39 +0200
Subject: [PATCH] fix RA on android (#942)

---
 src/lib.rs    | 2 --
 src/ui/gui.rs | 3 +++
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/lib.rs b/src/lib.rs
index d3fda223..b6b0b3ce 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -295,9 +295,7 @@ pub async fn run() -> std::io::Result<()> {
     } else {
         #[cfg(feature = "gui")]
         {
-            retroachievements::init_client(false, false, false);
             ui::gui::app_window(false);
-            retroachievements::shutdown_client();
         }
     }
 
diff --git a/src/ui/gui.rs b/src/ui/gui.rs
index 71818c8f..bae46769 100644
--- a/src/ui/gui.rs
+++ b/src/ui/gui.rs
@@ -1,3 +1,4 @@
+use crate::retroachievements;
 use crate::ui;
 #[cfg(target_os = "android")]
 use crate::ui::android;
@@ -500,6 +501,7 @@ fn about_window(app: &AppWindow) {
 }
 
 pub fn app_window(is_android: bool) {
+    retroachievements::init_client(false, false, false);
     let app = AppWindow::new().unwrap();
     app.set_is_android(is_android);
     about_window(&app);
@@ -521,6 +523,7 @@ pub fn app_window(is_android: bool) {
         slint::CloseRequestResponse::HideWindow
     });
     app.run().unwrap();
+    retroachievements::shutdown_client();
 }
 
 pub fn run_rom(