From 07d2d0a023c98af77a039cde32d5fd02cb66e83f Mon Sep 17 00:00:00 2001
From: Anthony Calosa <anthonycalosa@gmail.com>
Date: Thu, 24 Oct 2024 07:30:16 +0800
Subject: [PATCH] update splash closing

---
 forge-gui-mobile-dev/src/forge/app/Main.java | 9 ++++++---
 forge-gui-mobile/src/forge/Forge.java        | 2 +-
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/forge-gui-mobile-dev/src/forge/app/Main.java b/forge-gui-mobile-dev/src/forge/app/Main.java
index 4103f79dc7a..040e0c28f8b 100644
--- a/forge-gui-mobile-dev/src/forge/app/Main.java
+++ b/forge-gui-mobile-dev/src/forge/app/Main.java
@@ -17,6 +17,7 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
 import java.util.ArrayList;
+import java.util.Optional;
 
 public class Main {
     private static final String versionString = BuildInfo.getVersionString();
@@ -79,9 +80,11 @@ public class Main {
 
         @Override
         public void closeSplashScreen() {
-            SplashScreen splash = SplashScreen.getSplashScreen();
-            if (splash != null) {
-                splash.close();
+            //could throw exception..
+            try {
+                Optional.ofNullable(SplashScreen.getSplashScreen()).ifPresent(SplashScreen::close);
+            } catch (Exception e) {
+                e.printStackTrace();
             }
         }
 
diff --git a/forge-gui-mobile/src/forge/Forge.java b/forge-gui-mobile/src/forge/Forge.java
index b0ed15250e6..4636aa2b07a 100644
--- a/forge-gui-mobile/src/forge/Forge.java
+++ b/forge-gui-mobile/src/forge/Forge.java
@@ -159,7 +159,7 @@ public class Forge implements ApplicationListener {
     public void create() {
         //install our error handler
         ExceptionHandler.registerErrorHandling();
-        getDeviceAdapter().closeSplashScreen();
+        FThreads.invokeInEdtLater(() -> getDeviceAdapter().closeSplashScreen());
 
         GuiBase.setIsAndroid(Gdx.app.getType() == Application.ApplicationType.Android);