Apple-2-Tools/apple2ix
1
0
Fork 0
mirror of https://github.com/mauiaaron/apple2.git synced 2025-08-15 05:27:32 +00:00
Code Issues Projects Releases Wiki Activity

Avoid NPE on showing splash screen

Browse Source
This commit is contained in:
Aaron Culliney
2015-09-15 22:41:33 -07:00
parent 5692c1dc95
commit 8d3de3ddd0
1 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -245,12 +245,14 @@ public class Apple2Activity extends Activity {
// Apparently not good to leave popup/dialog windows showing when backgrounding. // Apparently not good to leave popup/dialog windows showing when backgrounding.
// Dismiss these popups to avoid android.view.WindowLeaked issues // Dismiss these popups to avoid android.view.WindowLeaked issues
dismissAllMenus(); synchronized (this) {
dismissAllMenus();
mSplashScreen = null; mSplashScreen = null;
mMainMenu = null; mMainMenu = null;
nativeOnPause(true); nativeOnPause(true);
}
} }
@Override @Override
@@ -455,7 +457,11 @@ public class Apple2Activity extends Activity {
runOnUiThread(new Runnable() { runOnUiThread(new Runnable() {
@Override @Override
public void run() { public void run() {
mSplashScreen.show(); synchronized (Apple2Activity.this) {
if (mSplashScreen != null) {
mSplashScreen.show();
}
}
} }
}); });
} }