From ba0a21feca9af8a2b69a53cc963e7a7f47f058cb Mon Sep 17 00:00:00 2001
From: Logan McNaughton <848146+loganmc10@users.noreply.github.com>
Date: Tue, 23 Jun 2026 16:52:27 +0200
Subject: [PATCH] register tx early (#1114)

---
 src/ui/android.rs | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/ui/android.rs b/src/ui/android.rs
index 75765b72..1c3363ae 100644
--- a/src/ui/android.rs
+++ b/src/ui/android.rs
@@ -450,6 +450,9 @@ fn open_uri_on_jvm(
 }
 
 pub async fn select_rom(rom_dir: slint::SharedString) -> Option<std::path::PathBuf> {
+    let (tx, rx) = tokio::sync::oneshot::channel::<Option<std::path::PathBuf>>();
+    SELECT_ROM_TX.lock().await.replace(tx);
+
     if let Ok(app) = ANDROID_APP.lock()
         && let Some(app) = app.as_ref()
     {
@@ -463,8 +466,6 @@ pub async fn select_rom(rom_dir: slint::SharedString) -> Option<std::path::PathB
         eprintln!("Android app not initialized");
         return None;
     }
-    let (tx, rx) = tokio::sync::oneshot::channel::<Option<std::path::PathBuf>>();
-    SELECT_ROM_TX.lock().await.replace(tx);
 
     rx.await.unwrap_or(None)
 }