diff options
| author | Ryan Houdek <Sonicadvance1@gmail.com> | 2013-11-30 19:48:08 -0600 |
|---|---|---|
| committer | Ryan Houdek <Sonicadvance1@gmail.com> | 2013-11-30 19:48:08 -0600 |
| commit | bc017852644a085aed7234f47f6de5929f40fb40 (patch) | |
| tree | 374674f491ef362a5b44eeba9afa514a3484988c /Source/Android/src | |
| parent | 65ce711a2137a4969650312b3a447933ff58c1b7 (diff) | |
[Android] Fix an issue that occurs due to the warning dialog.
Diffstat (limited to 'Source/Android/src')
| -rw-r--r-- | Source/Android/src/org/dolphinemu/dolphinemu/settings/video/VideoSettingsFragment.java | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/Source/Android/src/org/dolphinemu/dolphinemu/settings/video/VideoSettingsFragment.java b/Source/Android/src/org/dolphinemu/dolphinemu/settings/video/VideoSettingsFragment.java index 3117668f5e..29a87b6fa2 100644 --- a/Source/Android/src/org/dolphinemu/dolphinemu/settings/video/VideoSettingsFragment.java +++ b/Source/Android/src/org/dolphinemu/dolphinemu/settings/video/VideoSettingsFragment.java @@ -15,7 +15,6 @@ import android.preference.ListPreference; import android.preference.PreferenceFragment; import android.preference.PreferenceManager; import android.preference.PreferenceScreen; -import android.util.Log; import org.dolphinemu.dolphinemu.R; import javax.microedition.khronos.egl.*; @@ -257,6 +256,11 @@ public final class VideoSettingsFragment extends PreferenceFragment } 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); + // Create an alert telling them that their phone sucks if (VideoSettingsFragment.SupportsGLES3() && VideoSettingsFragment.m_GLVendor != null @@ -268,10 +272,7 @@ public final class VideoSettingsFragment extends PreferenceFragment builder.setMessage(R.string.device_gles3compat_warning_msg); builder.setPositiveButton(R.string.yes, new DialogInterface.OnClickListener() { public void onClick(DialogInterface dialog, int which) { - mainScreen.getPreference(0).setEnabled(true); - mainScreen.getPreference(1).setEnabled(true); - mainScreen.getPreference(3).setEnabled(true); - //mainScreen.getPreference(4).setEnabled(false); + // Do Nothing. Just create the Yes button } }); builder.setNegativeButton(R.string.no, new DialogInterface.OnClickListener() { |