From ffb6fc4b976dc1cb9e70b389c71c6836f9d508cd Mon Sep 17 00:00:00 2001
From: Anthony Calosa <anthonycalosa@gmail.com>
Date: Thu, 18 Feb 2021 06:42:12 +0800
Subject: [PATCH] [Mobile] fix preferred icons

---
 forge-gui-mobile/src/forge/assets/FSkin.java      | 2 +-
 forge-gui-mobile/src/forge/assets/FSkinImage.java | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/forge-gui-mobile/src/forge/assets/FSkin.java b/forge-gui-mobile/src/forge/assets/FSkin.java
index 2fe9caa7192..45c71d83811 100644
--- a/forge-gui-mobile/src/forge/assets/FSkin.java
+++ b/forge-gui-mobile/src/forge/assets/FSkin.java
@@ -66,7 +66,7 @@ public class FSkin {
                             public void run() {
                                 FSkinFont.deleteCachedFiles(); //delete cached font files so font can be update for new skin
                                 FSkinFont.updateAll();
-                                CardImageRenderer.forceStaticFieldUpdate();
+                                //CardImageRenderer.forceStaticFieldUpdate();
                                 FThreads.invokeInEdtLater(new Runnable() {
                                     @Override
                                     public void run() {
diff --git a/forge-gui-mobile/src/forge/assets/FSkinImage.java b/forge-gui-mobile/src/forge/assets/FSkinImage.java
index 344b42fdd23..1b75c4a69f2 100644
--- a/forge-gui-mobile/src/forge/assets/FSkinImage.java
+++ b/forge-gui-mobile/src/forge/assets/FSkinImage.java
@@ -465,7 +465,7 @@ public enum FSkinImage implements FImage {
             }
         }
         if (texture != null) {
-            if (sourceFile != SourceFile.ICONS && sourceFile != SourceFile.MANAICONS) { //just return region for preferred file if not icons file
+            if (!(sourceFile == SourceFile.ICONS || sourceFile == SourceFile.MANAICONS)) { //just return region for preferred file if not icons file
                 textureRegion = new TextureRegion(texture, x, y, w, h);
                 return;
             }