diff options
| author | 2023-05-31 02:23:23 -0400 | |
|---|---|---|
| committer | 2023-06-03 00:06:05 -0700 | |
| commit | fdd200d33f1dd4789257ed2ddb207a9b067133bb (patch) | |
| tree | 475979ceb2df0d2933982ced74044cd603ee55a4 /src/android | |
| parent | android: Fix link text color for base theme dialog (diff) | |
| download | yuzu-fdd200d33f1dd4789257ed2ddb207a9b067133bb.tar.gz yuzu-fdd200d33f1dd4789257ed2ddb207a9b067133bb.tar.xz yuzu-fdd200d33f1dd4789257ed2ddb207a9b067133bb.zip | |
android: Prevent deleting the settings file while a game is running
Diffstat (limited to 'src/android')
3 files changed, 7 insertions, 2 deletions
diff --git a/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/model/view/RunnableSetting.kt b/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/model/view/RunnableSetting.kt index dc89b5774..caaab50d8 100644 --- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/model/view/RunnableSetting.kt +++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/model/view/RunnableSetting.kt | |||
| @@ -6,6 +6,7 @@ package org.yuzu.yuzu_emu.features.settings.model.view | |||
| 6 | class RunnableSetting( | 6 | class RunnableSetting( |
| 7 | titleId: Int, | 7 | titleId: Int, |
| 8 | descriptionId: Int, | 8 | descriptionId: Int, |
| 9 | val isRuntimeRunnable: Boolean, | ||
| 9 | val runnable: () -> Unit | 10 | val runnable: () -> Unit |
| 10 | ) : SettingsItem(null, titleId, descriptionId) { | 11 | ) : SettingsItem(null, titleId, descriptionId) { |
| 11 | override val type = TYPE_RUNNABLE | 12 | override val type = TYPE_RUNNABLE |
diff --git a/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/SettingsFragmentPresenter.kt b/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/SettingsFragmentPresenter.kt index d9abc358a..7d55c5b2f 100644 --- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/SettingsFragmentPresenter.kt +++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/SettingsFragmentPresenter.kt | |||
| @@ -115,7 +115,8 @@ class SettingsFragmentPresenter(private val fragmentView: SettingsFragmentView) | |||
| 115 | add( | 115 | add( |
| 116 | RunnableSetting( | 116 | RunnableSetting( |
| 117 | R.string.reset_to_default, | 117 | R.string.reset_to_default, |
| 118 | 0 | 118 | 0, |
| 119 | false | ||
| 119 | ) { | 120 | ) { |
| 120 | ResetSettingsDialogFragment().show( | 121 | ResetSettingsDialogFragment().show( |
| 121 | settingsActivity.supportFragmentManager, | 122 | settingsActivity.supportFragmentManager, |
diff --git a/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/viewholder/RunnableViewHolder.kt b/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/viewholder/RunnableViewHolder.kt index 0c0bb93fc..5dad5945f 100644 --- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/viewholder/RunnableViewHolder.kt +++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/viewholder/RunnableViewHolder.kt | |||
| @@ -4,6 +4,7 @@ | |||
| 4 | package org.yuzu.yuzu_emu.features.settings.ui.viewholder | 4 | package org.yuzu.yuzu_emu.features.settings.ui.viewholder |
| 5 | 5 | ||
| 6 | import android.view.View | 6 | import android.view.View |
| 7 | import org.yuzu.yuzu_emu.NativeLibrary | ||
| 7 | import org.yuzu.yuzu_emu.databinding.ListItemSettingBinding | 8 | import org.yuzu.yuzu_emu.databinding.ListItemSettingBinding |
| 8 | import org.yuzu.yuzu_emu.features.settings.model.view.RunnableSetting | 9 | import org.yuzu.yuzu_emu.features.settings.model.view.RunnableSetting |
| 9 | import org.yuzu.yuzu_emu.features.settings.model.view.SettingsItem | 10 | import org.yuzu.yuzu_emu.features.settings.model.view.SettingsItem |
| @@ -25,7 +26,9 @@ class RunnableViewHolder(val binding: ListItemSettingBinding, adapter: SettingsA | |||
| 25 | } | 26 | } |
| 26 | 27 | ||
| 27 | override fun onClick(clicked: View) { | 28 | override fun onClick(clicked: View) { |
| 28 | setting.runnable.invoke() | 29 | if (!setting.isRuntimeRunnable && !NativeLibrary.isRunning()) { |
| 30 | setting.runnable.invoke() | ||
| 31 | } | ||
| 29 | } | 32 | } |
| 30 | 33 | ||
| 31 | override fun onLongClick(clicked: View): Boolean { | 34 | override fun onLongClick(clicked: View): Boolean { |