ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[Android] Fix an issue that occurs due to the warning dialog.

This commit is contained in:
Ryan Houdek 2013-11-30 19:48:08 -06:00
parent 65ce711a21
commit bc01785264
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Source/Android/src/org/dolphinemu/dolphinemu/settings/video/VideoSettingsFragment.java
View File

@ -15,7 +15,6 @@ import android.preference.ListPreference;
import android.preference.PreferenceFragment; import android.preference.PreferenceFragment;
import android.preference.PreferenceManager; import android.preference.PreferenceManager;
import android.preference.PreferenceScreen; import android.preference.PreferenceScreen;
import android.util.Log;
import org.dolphinemu.dolphinemu.R; import org.dolphinemu.dolphinemu.R;
import javax.microedition.khronos.egl.*; import javax.microedition.khronos.egl.*;
@ -257,6 +256,11 @@ public final class VideoSettingsFragment extends PreferenceFragment
} }
else if (preference.getString(key, "Software Renderer").equals("OGL")) 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 // Create an alert telling them that their phone sucks
if (VideoSettingsFragment.SupportsGLES3() if (VideoSettingsFragment.SupportsGLES3()
&& VideoSettingsFragment.m_GLVendor != null && VideoSettingsFragment.m_GLVendor != null
@ -268,10 +272,7 @@ public final class VideoSettingsFragment extends PreferenceFragment
builder.setMessage(R.string.device_gles3compat_warning_msg); builder.setMessage(R.string.device_gles3compat_warning_msg);
builder.setPositiveButton(R.string.yes, new DialogInterface.OnClickListener() { builder.setPositiveButton(R.string.yes, new DialogInterface.OnClickListener() {
public void onClick(DialogInterface dialog, int which) { public void onClick(DialogInterface dialog, int which) {
mainScreen.getPreference(0).setEnabled(true); // Do Nothing. Just create the Yes button
mainScreen.getPreference(1).setEnabled(true);
mainScreen.getPreference(3).setEnabled(true);
//mainScreen.getPreference(4).setEnabled(false);
} }
}); });
builder.setNegativeButton(R.string.no, new DialogInterface.OnClickListener() { builder.setNegativeButton(R.string.no, new DialogInterface.OnClickListener() {