From e198e201e407b4ce63fa5b98ddb49473a1a0c4ef Mon Sep 17 00:00:00 2001 From: Lioncash Date: Mon, 2 Sep 2013 11:00:22 -0400 Subject: [PATCH] [Android] Fix the video settings from crashing the app. Was broke in the commit "Removal of my terrible idea" https://code.google.com/p/dolphin-emu/source/detail?r=2897619ddbd3e3aae8427fc503647c65e770d466 Didn't comment out the line for that preference in the XML. This is disabled for now until the UI overlay for the buttons are implemented directly into the Java front-end. --- .../dolphinemu/settings/VideoSettingsFragment.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Source/Android/src/org/dolphinemu/dolphinemu/settings/VideoSettingsFragment.java b/Source/Android/src/org/dolphinemu/dolphinemu/settings/VideoSettingsFragment.java index 14e512f78c..9f7448765b 100644 --- a/Source/Android/src/org/dolphinemu/dolphinemu/settings/VideoSettingsFragment.java +++ b/Source/Android/src/org/dolphinemu/dolphinemu/settings/VideoSettingsFragment.java @@ -215,14 +215,14 @@ public final class VideoSettingsFragment extends PreferenceFragment mainScreen.getPreference(0).setEnabled(false); mainScreen.getPreference(1).setEnabled(false); mainScreen.getPreference(3).setEnabled(false); - mainScreen.getPreference(4).setEnabled(true); + //mainScreen.getPreference(4).setEnabled(true); } else if (videoBackends.getValue().equals("OGL")) { mainScreen.getPreference(0).setEnabled(true); mainScreen.getPreference(1).setEnabled(true); mainScreen.getPreference(3).setEnabled(true); - mainScreen.getPreference(4).setEnabled(false); + //mainScreen.getPreference(4).setEnabled(false); } // Also set a listener, so that if someone changes the video backend, it will disable @@ -239,14 +239,14 @@ public final class VideoSettingsFragment extends PreferenceFragment mainScreen.getPreference(0).setEnabled(false); mainScreen.getPreference(1).setEnabled(false); mainScreen.getPreference(3).setEnabled(false); - mainScreen.getPreference(4).setEnabled(true); + //mainScreen.getPreference(4).setEnabled(true); } else if (preference.getString(key, "Software Renderer").equals("OGL")) { mainScreen.getPreference(0).setEnabled(true); mainScreen.getPreference(1).setEnabled(true); mainScreen.getPreference(3).setEnabled(true); - mainScreen.getPreference(4).setEnabled(false); + //mainScreen.getPreference(4).setEnabled(false); } } }