diff options
| author | Markus Wick <degasus@users.noreply.github.com> | 2017-05-18 15:15:05 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-05-18 15:15:05 +0200 |
| commit | ec7c4ff92e7ef15ca8a23cf5424a99bc67918edf (patch) | |
| tree | f979677100126d84afd9beac4be5c76ed289e11b /Source | |
| parent | 8be41d3b7c9c33f7f5d59d5cce9e11335ee8559d (diff) | |
| parent | 3e33c99f4cb7820bfcb887347f93c545b2d18848 (diff) | |
Merge pull request #5439 from SeannyM/crash-fix
Android: Initialize video backend setting on first run
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/ui/settings/SettingsFragmentPresenter.java | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/ui/settings/SettingsFragmentPresenter.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/ui/settings/SettingsFragmentPresenter.java index 982b2c1d70..df6262538d 100644 --- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/ui/settings/SettingsFragmentPresenter.java +++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/ui/settings/SettingsFragmentPresenter.java @@ -260,6 +260,13 @@ public final class SettingsFragmentPresenter mView.passSettingsToActivity(mSettings); } + if (mSettings.get(SettingsFile.SETTINGS_DOLPHIN).isEmpty()) + { + mSettings.get(SettingsFile.SETTINGS_DOLPHIN).put(SettingsFile.SECTION_CORE, new SettingSection(SettingsFile.SECTION_CORE)); + + mView.passSettingsToActivity(mSettings); + } + sl.add(new SingleChoiceSetting(SettingsFile.KEY_VIDEO_BACKEND_INDEX, SettingsFile.SECTION_CORE, SettingsFile.SETTINGS_DOLPHIN, R.string.video_backend, R.string.video_backend_descrip, R.array.videoBackendEntries, R.array.videoBackendValues, 0, videoBackend)); sl.add(new CheckBoxSetting(SettingsFile.KEY_SHOW_FPS, SettingsFile.SECTION_GFX_SETTINGS, SettingsFile.SETTINGS_GFX, R.string.show_fps, 0, true, showFps)); |