Apple-2-Tools/apple2ix
1
0
Fork 0
mirror of https://github.com/mauiaaron/apple2.git synced 2024-06-26 00:29:27 +00:00
Code Issues Projects Releases Wiki Activity

Simplify splash screen showing logic

Browse Source
This commit is contained in:
Aaron Culliney 2015-10-04 13:08:12 -07:00
parent 9e86f493d0
commit 242c083180
1 changed files with 9 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -213,10 +213,6 @@ public class Apple2Activity extends Activity {
// Dismiss these popups to avoid android.view.WindowLeaked issues
synchronized (this) {
dismissAllMenus();
mSplashScreen = null;
mMainMenu = null;
nativeOnPause(true);
}
@ -393,7 +389,7 @@ public class Apple2Activity extends Activity {
return super.onTouchEvent(event);
}
public void graphicsInitialized(int w, int h) {
void graphicsInitialized(int w, int h) {
if (mMainMenu == null) {
mMainMenu = new Apple2MainMenu(this, mView);
}
@ -428,19 +424,19 @@ public class Apple2Activity extends Activity {
return mMainMenu;
}
public synchronized void showSplashScreen() {
if (mSplashScreen != null) {
return;
}
mSplashScreen = new Apple2SplashScreen(Apple2Activity.this);
private void showSplashScreen() {
runOnUiThread(new Runnable() {
@Override
public void run() {
synchronized (Apple2Activity.this) {
if (mSplashScreen != null) {
mSplashScreen.show();
Apple2CrashHandler.getInstance().checkForCrashes(Apple2Activity.this);
if (mSplashScreen == null) {
mSplashScreen = new Apple2SplashScreen(Apple2Activity.this);
}
if (mSplashScreen.isShowing()) {
return;
}
mSplashScreen.show();
Apple2CrashHandler.getInstance().checkForCrashes(Apple2Activity.this);
}
}
});