diff --git a/Android/app/src/main/java/org/deadc0de/apple2ix/Apple2AbstractMenu.java b/Android/app/src/main/java/org/deadc0de/apple2ix/Apple2AbstractMenu.java index f20ba3dd..1da8b9e1 100644 --- a/Android/app/src/main/java/org/deadc0de/apple2ix/Apple2AbstractMenu.java +++ b/Android/app/src/main/java/org/deadc0de/apple2ix/Apple2AbstractMenu.java @@ -43,7 +43,7 @@ public abstract class Apple2AbstractMenu implements Apple2MenuView { setup(); } - public synchronized void show() { + public void show() { if (isShowing()) { return; } @@ -59,7 +59,7 @@ public abstract class Apple2AbstractMenu implements Apple2MenuView { } public boolean isShowing() { - return mSettingsView.isShown(); + return mSettingsView.getParent() != null; } public View getView() { diff --git a/Android/app/src/main/java/org/deadc0de/apple2ix/Apple2Activity.java b/Android/app/src/main/java/org/deadc0de/apple2ix/Apple2Activity.java index e3dac9d7..e16b0025 100644 --- a/Android/app/src/main/java/org/deadc0de/apple2ix/Apple2Activity.java +++ b/Android/app/src/main/java/org/deadc0de/apple2ix/Apple2Activity.java @@ -582,8 +582,9 @@ public class Apple2Activity extends Activity { // Actually remove View from view hierarchy { View menuView = apple2MenuView.getView(); - if (menuView.isShown()) { - ((ViewGroup) menuView.getParent()).removeView(menuView); + ViewGroup viewGroup = (ViewGroup) menuView.getParent(); + if (viewGroup != null) { + viewGroup.removeView(menuView); } if (apple2MenuView == mSplashScreen) { mSplashScreen = null; diff --git a/Android/app/src/main/java/org/deadc0de/apple2ix/Apple2DisksMenu.java b/Android/app/src/main/java/org/deadc0de/apple2ix/Apple2DisksMenu.java index aea19bfe..6e7107d0 100644 --- a/Android/app/src/main/java/org/deadc0de/apple2ix/Apple2DisksMenu.java +++ b/Android/app/src/main/java/org/deadc0de/apple2ix/Apple2DisksMenu.java @@ -184,7 +184,7 @@ public class Apple2DisksMenu implements Apple2MenuView { } public boolean isShowing() { - return mDisksView.isShown(); + return mDisksView.getParent() != null; } public View getView() { diff --git a/Android/app/src/main/java/org/deadc0de/apple2ix/Apple2JoystickCalibration.java b/Android/app/src/main/java/org/deadc0de/apple2ix/Apple2JoystickCalibration.java index 2b9c7d17..5c662dbf 100644 --- a/Android/app/src/main/java/org/deadc0de/apple2ix/Apple2JoystickCalibration.java +++ b/Android/app/src/main/java/org/deadc0de/apple2ix/Apple2JoystickCalibration.java @@ -114,7 +114,7 @@ public class Apple2JoystickCalibration implements Apple2MenuView { } public boolean isShowing() { - return mSettingsView.isShown(); + return mSettingsView.getParent() != null; } public View getView() { diff --git a/Android/app/src/main/java/org/deadc0de/apple2ix/Apple2KeypadChooser.java b/Android/app/src/main/java/org/deadc0de/apple2ix/Apple2KeypadChooser.java index 309ad28f..0c7acfed 100644 --- a/Android/app/src/main/java/org/deadc0de/apple2ix/Apple2KeypadChooser.java +++ b/Android/app/src/main/java/org/deadc0de/apple2ix/Apple2KeypadChooser.java @@ -119,7 +119,7 @@ public class Apple2KeypadChooser implements Apple2MenuView { } public boolean isShowing() { - return mSettingsView.isShown(); + return mSettingsView.getParent() != null; } public View getView() { diff --git a/Android/app/src/main/java/org/deadc0de/apple2ix/Apple2SplashScreen.java b/Android/app/src/main/java/org/deadc0de/apple2ix/Apple2SplashScreen.java index 98783074..d9373036 100644 --- a/Android/app/src/main/java/org/deadc0de/apple2ix/Apple2SplashScreen.java +++ b/Android/app/src/main/java/org/deadc0de/apple2ix/Apple2SplashScreen.java @@ -71,7 +71,7 @@ public class Apple2SplashScreen implements Apple2MenuView { /* ... */ } - public synchronized void show() { + public void show() { if (isShowing()) { return; } @@ -87,7 +87,7 @@ public class Apple2SplashScreen implements Apple2MenuView { } public boolean isShowing() { - return mSettingsView.isShown(); + return mSettingsView.getParent() != null; } public View getView() {