From 604dead31181b8c3740085dc6a7dafca9451277d Mon Sep 17 00:00:00 2001
From: Evan Debenham <Evan@ShatteredPixel.com>
Date: Mon, 5 Jun 2023 23:29:14 -0400
Subject: [PATCH] v2.1.1: fixed crash errors with inventory radial menu and
 targeting

---
 .../shatteredpixeldungeon/ui/InventoryPane.java              | 5 +++++
 .../com/shatteredpixel/shatteredpixeldungeon/ui/Toolbar.java | 1 +
 .../shatteredpixeldungeon/windows/WndUseItem.java            | 2 +-
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/InventoryPane.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/InventoryPane.java
index 967de60cf..4aa9eb5d5 100644
--- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/InventoryPane.java
+++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/InventoryPane.java
@@ -404,10 +404,15 @@ public class InventoryPane extends Component {
 		return selector != null;
 	}
 
+	public static void clearTargetingSlot(){
+		targetingSlot = null;
+	}
+
 	public static void useTargeting(){
 		if (instance != null &&
 				instance.visible &&
 				lastTarget != null &&
+				targetingSlot != null &&
 				Actor.chars().contains( lastTarget ) &&
 				lastTarget.isAlive() &&
 				lastTarget.alignment != Char.Alignment.ALLY &&
diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/Toolbar.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/Toolbar.java
index 7fa13ac47..5a0fc3cea 100644
--- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/Toolbar.java
+++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/Toolbar.java
@@ -463,6 +463,7 @@ public class Toolbar extends Component {
 									if (alt && item.defaultAction() != null) {
 										item.execute(Dungeon.hero);
 									} else {
+										InventoryPane.clearTargetingSlot();
 										Game.scene().addToFront(new WndUseItem(null, item));
 									}
 								}
diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/windows/WndUseItem.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/windows/WndUseItem.java
index 0c8700152..fe5835574 100644
--- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/windows/WndUseItem.java
+++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/windows/WndUseItem.java
@@ -55,7 +55,7 @@ public class WndUseItem extends WndInfoItem {
 							item.execute( Dungeon.hero, action );
 						}
 						Item.updateQuickslot();
-						if (action == item.defaultAction() && item.usesTargeting && owner == null){
+						if (action.equals(item.defaultAction()) && item.usesTargeting && owner == null){
 							InventoryPane.useTargeting();
 						}
 					}