VERY experimental Nintendo Switch 2 emulator
C++
android: Close activity with toast if emulation has no game
Charles Lombardo3d9fd8049635
diff --git a/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/EmulationFragment.kt b/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/EmulationFragment.ktindex 750638bc9f..aa9cea4427 100644--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/EmulationFragment.kt+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/EmulationFragment.kt@@ -17,6 +17,7 @@ import android.os.Handlerimport android.os.Looperimport android.view.*import android.widget.TextView+import android.widget.Toastimport androidx.activity.OnBackPressedCallbackimport androidx.appcompat.widget.PopupMenuimport androidx.core.content.res.ResourcesCompat@@ -53,6 +54,7 @@ import org.yuzu.yuzu_emu.model.Gameimport org.yuzu.yuzu_emu.model.EmulationViewModelimport org.yuzu.yuzu_emu.overlay.InputOverlayimport org.yuzu.yuzu_emu.utils.*+import java.lang.NullPointerExceptionclass EmulationFragment : Fragment(), SurfaceHolder.Callback {private lateinit var preferences: SharedPreferences@@ -104,10 +106,21 @@ class EmulationFragment : Fragment(), SurfaceHolder.Callback {null}}- game = if (args.game != null) {- args.game!!- } else {- intentGame ?: error("[EmulationFragment] No bootable game present!")++ try {+ game = if (args.game != null) {+ args.game!!+ } else {+ intentGame!!+ }+ } catch (e: NullPointerException) {+ Toast.makeText(+ requireContext(),+ R.string.no_game_present,+ Toast.LENGTH_SHORT+ ).show()+ requireActivity().finish()+ return}// So this fragment doesn't restart on configuration changes; i.e. rotation.@@ -131,6 +144,11 @@ class EmulationFragment : Fragment(), SurfaceHolder.Callback {// This is using the correct scope, lint is just acting up@SuppressLint("UnsafeRepeatOnLifecycleDetector")override fun onViewCreated(view: View, savedInstanceState: Bundle?) {+ super.onViewCreated(view, savedInstanceState)+ if (requireActivity().isFinishing) {+ return+ }+binding.surfaceEmulation.holder.addCallback(this)binding.showFpsText.setTextColor(Color.YELLOW)binding.doneControlConfig.setOnClickListener { stopConfiguringControls() }diff --git a/src/android/app/src/main/res/values/strings.xml b/src/android/app/src/main/res/values/strings.xmlindex 574290479e..0347614010 100644--- a/src/android/app/src/main/res/values/strings.xml+++ b/src/android/app/src/main/res/values/strings.xml@@ -294,6 +294,7 @@<string name="performance_warning">Turning off this setting will significantly reduce emulation performance! For the best experience, it is recommended that you leave this setting enabled.</string><string name="device_memory_inadequate">Device RAM: %1$s\nRecommended: %2$s</string><string name="memory_formatted">%1$s %2$s</string>+ <string name="no_game_present">No bootable game present!</string><!-- Region Names --><string name="region_japan">Japan</string>