summaryrefslogtreecommitdiff
path: root/src/android
diff options
context:
space:
mode:
authorGravatar bunnei2023-03-18 21:28:22 -0700
committerGravatar bunnei2023-06-03 00:05:43 -0700
commitb5b4e50c32364ed1cd5c56f70a055cf8b20b1837 (patch)
treed4caa10210ce9a2aa96f45ba214eee49d6c12479 /src/android
parentandroid: res: fragment_emulation: Ensure FPS counter is shown. (diff)
downloadyuzu-b5b4e50c32364ed1cd5c56f70a055cf8b20b1837.tar.gz
yuzu-b5b4e50c32364ed1cd5c56f70a055cf8b20b1837.tar.xz
yuzu-b5b4e50c32364ed1cd5c56f70a055cf8b20b1837.zip
android: EmulationActivity: Fix variable shadowing in fragment creation.
Diffstat (limited to 'src/android')
-rw-r--r--src/android/app/src/main/java/org/yuzu/yuzu_emu/activities/EmulationActivity.kt4
1 files changed, 2 insertions, 2 deletions
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 cbec4836b..44d002016 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
@@ -72,12 +72,12 @@ open class EmulationActivity : AppCompatActivity() {
72 setContentView(R.layout.activity_emulation) 72 setContentView(R.layout.activity_emulation)
73 73
74 // Find or create the EmulationFragment 74 // Find or create the EmulationFragment
75 var emulationFragment = 75 emulationFragment =
76 supportFragmentManager.findFragmentById(R.id.frame_emulation_fragment) as EmulationFragment? 76 supportFragmentManager.findFragmentById(R.id.frame_emulation_fragment) as EmulationFragment?
77 if (emulationFragment == null) { 77 if (emulationFragment == null) {
78 emulationFragment = EmulationFragment.newInstance(path) 78 emulationFragment = EmulationFragment.newInstance(path)
79 supportFragmentManager.beginTransaction() 79 supportFragmentManager.beginTransaction()
80 .add(R.id.frame_emulation_fragment, emulationFragment) 80 .add(R.id.frame_emulation_fragment, emulationFragment!!)
81 .commit() 81 .commit()
82 } 82 }
83 title = selectedTitle 83 title = selectedTitle