From dd6d6b4cf9ee5ee1059d6dc4cf16dd0ef8a7e263 Mon Sep 17 00:00:00 2001
From: Producdevity <y.gherbi.dev@gmail.com>
Date: Wed, 30 Jul 2025 14:34:20 +0200
Subject: [PATCH] fix: reset navigation graph with new intent data in
 EmulationActivity

---
 .../java/org/yuzu/yuzu_emu/activities/EmulationActivity.kt  | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/android/app/src/main/java/org/yuzu/yuzu_emu/activities/EmulationActivity.kt b/src/android/app/src/main/java/org/yuzu/yuzu_emu/activities/EmulationActivity.kt
index 1aa300f82d..e01dc754eb 100644
--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/activities/EmulationActivity.kt
+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/activities/EmulationActivity.kt
@@ -202,6 +202,12 @@ class EmulationActivity : AppCompatActivity(), SensorEventListener {
     override fun onNewIntent(intent: Intent) {
         super.onNewIntent(intent)
         setIntent(intent)
+
+        // Reset navigation graph with new intent data to recreate EmulationFragment
+        val navHostFragment =
+            supportFragmentManager.findFragmentById(R.id.fragment_container) as NavHostFragment
+        navHostFragment.navController.setGraph(R.navigation.emulation_navigation, intent.extras)
+
         nfcReader.onNewIntent(intent)
         InputHandler.updateControllerData()
     }