From 3ce1b2858c51f8cda326da8c3a211abb1c639829 Mon Sep 17 00:00:00 2001
From: Anthony Calosa <anthonycalosa@gmail.com>
Date: Tue, 14 Jun 2022 16:22:50 +0800
Subject: [PATCH] update fix

---
 .../src/forge/adventure/scene/RewardScene.java        | 11 ++++++++++-
 .../src/forge/adventure/util/RewardActor.java         |  6 +++---
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/forge-gui-mobile/src/forge/adventure/scene/RewardScene.java b/forge-gui-mobile/src/forge/adventure/scene/RewardScene.java
index f04ab9ec7f7..f5e0a87be5b 100644
--- a/forge-gui-mobile/src/forge/adventure/scene/RewardScene.java
+++ b/forge-gui-mobile/src/forge/adventure/scene/RewardScene.java
@@ -72,6 +72,16 @@ public class RewardScene extends UIScene {
                 exitCountDown = 0.0f;
                 doneClicked = true;
             } else {
+                for (Actor actor : new Array.ArrayIterator<>(generated)) {
+                    if (!(actor instanceof RewardActor)) {
+                        continue;
+                    }
+                    RewardActor reward = (RewardActor) actor;
+                    reward.clearHoldToolTip();
+                    try {
+                        stage.getActors().removeValue(reward, true);
+                    } catch (Exception e) {}
+                }
                 Forge.switchToLast();
             }
         } else {
@@ -117,7 +127,6 @@ public class RewardScene extends UIScene {
 
 
     public void loadRewards(Array<Reward> newRewards, Type type, ShopActor shopActor) {
-        RewardActor.clearHoldToolTip();
         this.type = type;
         doneClicked = false;
 
diff --git a/forge-gui-mobile/src/forge/adventure/util/RewardActor.java b/forge-gui-mobile/src/forge/adventure/util/RewardActor.java
index ab61ee17ef9..7e945be04a3 100644
--- a/forge-gui-mobile/src/forge/adventure/util/RewardActor.java
+++ b/forge-gui-mobile/src/forge/adventure/util/RewardActor.java
@@ -44,7 +44,7 @@ import static forge.adventure.util.Paths.ITEMS_ATLAS;
  */
 public class RewardActor extends Actor implements Disposable, ImageFetcher.Callback {
     Tooltip<Image> tooltip;
-    static HoldTooltip holdTooltip;
+    HoldTooltip holdTooltip;
     Reward reward;
     ShaderProgram shaderGrayscale = Forge.getGraphics().getShaderGrayscale();
 
@@ -59,7 +59,7 @@ public class RewardActor extends Actor implements Disposable, ImageFetcher.Callb
     boolean clicked = false;
     boolean sold = false;
     boolean flipOnClick;
-    private static boolean hover;
+    private boolean hover;
 
     public static int renderedCount = 0; //Counter for cards that require rendering a preview.
     static final ImageFetcher fetcher = GuiBase.getInterface().getImageFetcher();
@@ -267,7 +267,7 @@ public class RewardActor extends Actor implements Disposable, ImageFetcher.Callb
     public boolean isFlipped() {
         return (clicked && flipProcess >= 1);
     }
-    public static void clearHoldToolTip() {
+    public void clearHoldToolTip() {
         if (holdTooltip != null) {
             try {
                 hover = false;