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

Fix an issue with importing unmerged changes from pull

This commit is contained in:
TwistedUmbrella 2014-02-24 00:25:11 -05:00
parent f536c67f26
commit 88eea7f0e9
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -156,9 +156,9 @@ public class OnScreenMenu {
private View audiosetting; private View audiosetting;
private View fdown; private View fdown;
private View fup; private View fup;
private int frames = Config.frameskip; private int frames = ConfigureFragment.frameskip;
private boolean screen = Config.widescreen; private boolean screen = ConfigureFragment.widescreen;
private boolean limit = Config.limitfps; private boolean limit = ConfigureFragment.limitfps;
private boolean audio; private boolean audio;
public ConfigPopup(Context c) { public ConfigPopup(Context c) {
@ -204,20 +204,20 @@ public class OnScreenMenu {
public void onClick(View v) { public void onClick(View v) {
frameskip++; frameskip++;
JNIdc.frameskip(frameskip); JNIdc.frameskip(frameskip);
enableState(frames_up, frames_down); enableState(fup, fdown);
} }
}); });
fup = addbut(R.drawable.frames_up, new OnClickListener() { fup = addbut(R.drawable.frames_up, new OnClickListener() {
public void onClick(View v) { public void onClick(View v) {
frameskip--; frameskip--;
JNIdc.frameskip(frameskip); JNIdc.frameskip(frameskip);
enableState(frames_up, frames_down); enableState(fup, fdown);
} }
}); });
hlay.addView(frames_up, params); hlay.addView(fup, params);
hlay.addView(frames_down, params); hlay.addView(fdown, params);
enableState(frames_up, frames_down); enableState(fup, fdown);
framelimit = addbut(R.drawable.frames_limit_on, framelimit = addbut(R.drawable.frames_limit_on,