diff --git a/forge-gui-mobile/src/forge/assets/AssetsDownloader.java b/forge-gui-mobile/src/forge/assets/AssetsDownloader.java index b7536cc3bed..d16a0101f86 100644 --- a/forge-gui-mobile/src/forge/assets/AssetsDownloader.java +++ b/forge-gui-mobile/src/forge/assets/AssetsDownloader.java @@ -44,7 +44,7 @@ public class AssetsDownloader { Gdx.app.exit(); //can't continue if this fails } } - else if (Forge.CURRENT_VERSION.equals(TextUtil.join(FileUtil.readFile(versionFile), "\n")) && !FSkin.assetsDownloadNeeded()) { + else if (Forge.CURRENT_VERSION.equals(TextUtil.join(FileUtil.readFile(versionFile), "\n")) && FSkin.getFontDir() != null) { return; //if version matches what had been previously saved and FSkin isn't requesting assets download, no need to download assets } @@ -54,7 +54,7 @@ public class AssetsDownloader { FThreads.invokeInEdtAndWait(new Runnable() { @Override public void run() { - FSkin.reloadAfterAssetsDownload(splashScreen); + FSkin.loadLight(FSkin.getName(), splashScreen); } }); diff --git a/forge-gui-mobile/src/forge/assets/FSkin.java b/forge-gui-mobile/src/forge/assets/FSkin.java index a9f062d9272..71efb137853 100644 --- a/forge-gui-mobile/src/forge/assets/FSkin.java +++ b/forge-gui-mobile/src/forge/assets/FSkin.java @@ -32,7 +32,6 @@ public class FSkin { private static FileHandle preferredFontDir; private static String preferredName; private static boolean loaded = false; - private static boolean needReloadAfterAssetsDownloaded = false; public static void changeSkin(final String skinName) { final ForgePreferences prefs = FModel.getPreferences(); @@ -66,7 +65,6 @@ public class FSkin { //if skins directory doesn't exist, point to internal assets/skin directory instead for the sake of the splash screen preferredDir = Gdx.files.internal("fallback_skin"); preferredFontDir = null; - needReloadAfterAssetsDownloaded = true; //flag that skins need to be reloaded after assets downloaded } else { if (splashScreen != null) { @@ -244,16 +242,6 @@ public class FSkin { } } - public static boolean assetsDownloadNeeded() { - return needReloadAfterAssetsDownloaded; - } - - public static void reloadAfterAssetsDownload(SplashScreen splashScreen) { - needReloadAfterAssetsDownloaded = false; - allSkins = null; - loadLight(preferredName, splashScreen); - } - /** * Gets the name. *