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

Merge pull request #287 from LoungeKatt/master 

@hooby3dfx This should get what you are looking for
This commit is contained in:
TwistedUmbrella 2014-02-16 12:33:02 -05:00
parent 540fd32089 7321808090
commit 17b1d51f4b
3 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
shell/android/src/com/reicast/emulator/MainActivity.java
View File

@ -59,8 +59,12 @@ public class MainActivity extends SlidingFragmentActivity implements
mUEHandler = new Thread.UncaughtExceptionHandler() {
public void uncaughtException(Thread t, Throwable error) {
if (error != null) {
Log.e("com.reicast.emulator", error.getMessage());
mPrefs.edit().putString("prior_error", error.getMessage()).commit();
String log = error.getMessage() + ": "
+ t.getStackTrace()[1].getLineNumber() + " / "
+ error.getStackTrace()[1].getLineNumber();
mPrefs.edit().putString("prior_error", log).commit();
error.printStackTrace();
//Unreliable, but useful when possible
MainActivity.this.finish();
}
}

2
shell/android/src/com/reicast/emulator/config/ConfigureFragment.java
View File

@ -114,7 +114,7 @@ public class ConfigureFragment extends Fragment {
mPrefs.edit().putBoolean("force_gpu", isChecked).commit();
}
};
boolean enhanced = mPrefs.getBoolean("sound_enabled",
boolean enhanced = mPrefs.getBoolean("force_gpu",
true);
force_gpu_opt.setChecked(enhanced);
force_gpu_opt.setOnCheckedChangeListener(force_gpu_options);

11
shell/android/src/com/reicast/emulator/emu/OnScreenMenu.java
View File

@ -62,7 +62,7 @@ public class OnScreenMenu {
}
void displayDebugPopup(final PopupWindow popUp) {
mContext.displayDebug(new DebugPopup());
mContext.displayDebug(new DebugPopup(mContext));
}
public class FpsPopup extends PopupWindow {
@ -88,7 +88,8 @@ public class OnScreenMenu {
public class DebugPopup extends PopupWindow {
public DebugPopup() {
public DebugPopup(Context c) {
super(c);
int p = getPixelsFromDp(60, mContext);
LayoutParams debugParams = new LayoutParams(p, p);
@ -146,7 +147,7 @@ public class OnScreenMenu {
}
void displayConfigPopup(final PopupWindow popUp) {
mContext.displayConfig(new ConfigPopup());
mContext.displayConfig(new ConfigPopup(mContext));
}
public class ConfigPopup extends PopupWindow {
@ -154,7 +155,8 @@ public class OnScreenMenu {
private View fullscreen;
private View framelimit;
public ConfigPopup() {
public ConfigPopup(Context c) {
super(c);
int p = getPixelsFromDp(60, mContext);
LayoutParams configParams = new LayoutParams(p, p);
@ -341,6 +343,7 @@ public class OnScreenMenu {
public class MainPopup extends PopupWindow {
public MainPopup(Context c) {
super(c);
int p = getPixelsFromDp(60, mContext);
params = new LayoutParams(p, p);
hlay = new LinearLayout(mContext);