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 cee68689c3..8bd742b56e 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 @@ -203,7 +203,7 @@ class EmulationActivity : AppCompatActivity(), SensorEventListener { override fun onDestroy() { super.onDestroy() stopForegroundService(this) - + NativeLibrary.playTimeManagerStop() } override fun onUserLeaveHint() { @@ -327,11 +327,6 @@ class EmulationActivity : AppCompatActivity(), SensorEventListener { override fun onAccuracyChanged(sensor: Sensor, i: Int) {} - override fun onDestroy() { - super.onDestroy() - NativeLibrary.playTimeManagerStop() - } - private fun enableFullscreenImmersive() { WindowCompat.setDecorFitsSystemWindows(window, false) diff --git a/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/GamePropertiesFragment.kt b/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/GamePropertiesFragment.kt index bc6272b857..e95977e11c 100644 --- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/GamePropertiesFragment.kt +++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/GamePropertiesFragment.kt @@ -432,24 +432,30 @@ class GamePropertiesFragment : Fragment() { SubmenuProperty( R.string.reset_playtime, R.string.reset_playtime_description, - R.drawable.ic_delete - ) { - MessageDialogFragment.newInstance( - requireActivity(), - titleId = R.string.reset_playtime, - descriptionId = R.string.reset_playtime_warning_description, - positiveAction = { - NativeLibrary.playTimeManagerResetProgramPlayTime( args.game.programId) - Toast.makeText( - YuzuApplication.appContext, - R.string.playtime_reset_successfully, - Toast.LENGTH_SHORT - ).show() - getPlayTime() - homeViewModel.reloadPropertiesList(true) + R.drawable.ic_delete, + actions = listOf( + SubMenuPropertySecondaryAction( + R.string.reset_playtime, + R.drawable.ic_delete + ) { + MessageDialogFragment.newInstance( + requireActivity(), + titleId = R.string.reset_playtime, + descriptionId = R.string.reset_playtime_warning_description, + positiveAction = { + NativeLibrary.playTimeManagerResetProgramPlayTime(args.game.programId) + Toast.makeText( + YuzuApplication.appContext, + R.string.playtime_reset_successfully, + Toast.LENGTH_SHORT + ).show() + getPlayTime() + homeViewModel.reloadPropertiesList(true) + } + ).show(parentFragmentManager, MessageDialogFragment.TAG) } - ).show(parentFragmentManager, MessageDialogFragment.TAG) - } + ) + ) ) } }