Apple-2-Tools/apple2ix
1
0
Fork 0
mirror of https://github.com/mauiaaron/apple2.git synced 2025-01-29 21:31:05 +00:00
Code Issues Projects Releases Wiki Activity

Avoid triggering a native resume when going to background after dismissing all Android UI

Browse Source 
- This appeared to occasionally get audio/cpu timing wedged
This commit is contained in:
Aaron Culliney 2015-09-26 14:52:15 -07:00
parent 47ce10b3a4
commit 0749c83c96
2 changed files with 19 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
Android/app/src/main/java/org/deadc0de/apple2ix/Apple2Activity.java
View File

@ -28,6 +28,7 @@ import android.view.ViewTreeObserver;
import android.widget.FrameLayout;
import java.util.ArrayList;
import java.util.concurrent.atomic.AtomicBoolean;
import org.deadc0de.apple2ix.basic.BuildConfig;
import org.deadc0de.apple2ix.basic.R;
@ -46,6 +47,8 @@ public class Apple2Activity extends Activity {
private ArrayList<Apple2MenuView> mMenuStack = new ArrayList<Apple2MenuView>();
private ArrayList<AlertDialog> mAlertDialogs = new ArrayList<AlertDialog>();
private AtomicBoolean mPausing = new AtomicBoolean(false);
private int mWidth = 0;
private int mHeight = 0;
@ -90,7 +93,7 @@ public class Apple2Activity extends Activity {
private native void nativeOnUncaughtException(String home, String trace);
public native void nativeOnResume(boolean isSystemResume);
private native void nativeOnResume(boolean isSystemResume);
public native void nativeOnPause(boolean isSystemPause);
@ -240,8 +243,11 @@ public class Apple2Activity extends Activity {
}
@Override
protected void onPause() {
protected synchronized void onPause() {
super.onPause();
mPausing.set(true);
Log.d(TAG, "onPause()");
mView.onPause();
@ -255,6 +261,8 @@ public class Apple2Activity extends Activity {
nativeOnPause(true);
}
mPausing.set(false);
}
@Override
@ -552,6 +560,14 @@ public class Apple2Activity extends Activity {
// if no more views on menu stack, resume emulation
if (mMenuStack.size() == 0) {
dismissAllMenus();
}
if (mMenuStack.size() == 0 && !mPausing.get()) {
nativeOnResume(/*isSystemResume:*/false);
}
}
void _mainMenuDismissed() {
if (mMenuStack.size() == 0 && !mPausing.get()) {
nativeOnResume(/*isSystemResume:*/false);
}
}

2
Android/app/src/main/java/org/deadc0de/apple2ix/Apple2MainMenu.java
View File

@ -166,7 +166,7 @@ public class Apple2MainMenu {
public void onDismiss() {
boolean otherMenusShowing = (getSettingsMenu().isShowing() || getDisksMenu().isShowing());
if (!otherMenusShowing) {
Apple2MainMenu.this.mActivity.nativeOnResume(/*isSystemResume:*/false);
Apple2MainMenu.this.mActivity._mainMenuDismissed();
}
}
});