From 0097b66cd610d3f11d7fb2fd2d4db02bc8c6e69a Mon Sep 17 00:00:00 2001 From: Anthony Calosa Date: Tue, 18 Jan 2022 07:17:23 +0800 Subject: [PATCH] [Mobile] fix NPE --- forge-gui-mobile/src/forge/screens/home/NewGameMenu.java | 2 ++ forge-gui-mobile/src/forge/screens/online/OnlineMenu.java | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/forge-gui-mobile/src/forge/screens/home/NewGameMenu.java b/forge-gui-mobile/src/forge/screens/home/NewGameMenu.java index ce792164202..8407f4115c0 100644 --- a/forge-gui-mobile/src/forge/screens/home/NewGameMenu.java +++ b/forge-gui-mobile/src/forge/screens/home/NewGameMenu.java @@ -93,6 +93,8 @@ public class NewGameMenu extends FPopupMenu { } public static NewGameScreen getPreferredScreen() { + if (preferredScreen == null) //shouldn't happen but we return constructed as default + return NewGameScreen.Constructed; return preferredScreen; } public static void setPreferredScreen(NewGameScreen preferredScreen0) { diff --git a/forge-gui-mobile/src/forge/screens/online/OnlineMenu.java b/forge-gui-mobile/src/forge/screens/online/OnlineMenu.java index 24acc1ccd6f..da063295a45 100644 --- a/forge-gui-mobile/src/forge/screens/online/OnlineMenu.java +++ b/forge-gui-mobile/src/forge/screens/online/OnlineMenu.java @@ -67,7 +67,7 @@ public class OnlineMenu extends FPopupMenu { private void initializeScreen() { if (screen == null) { //don't initialize screen until it's opened the first time try { - screen = screenClass.newInstance(); + screen = screenClass.getConstructor().newInstance(); screen.setHeaderCaption(Localizer.getInstance().getMessage("lblPlayOnline") + " - " + item.getText()); } catch (Exception e) {