From 3104c84d2049812718d5111bd82ac667ff8556a2 Mon Sep 17 00:00:00 2001
From: Zeffuro <Jeffroiscool@gmail.com>
Date: Mon, 29 Dec 2025 21:56:33 +0100
Subject: [PATCH] Safely unblock addon if blocked from opening discard dialogue

---
 AetherBags/Addons/AddonInventoryWindow.cs | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/AetherBags/Addons/AddonInventoryWindow.cs b/AetherBags/Addons/AddonInventoryWindow.cs
index 565a744..faf0d95 100644
--- a/AetherBags/Addons/AddonInventoryWindow.cs
+++ b/AetherBags/Addons/AddonInventoryWindow.cs
@@ -8,6 +8,8 @@ using AetherBags.Nodes.Inventory;
 using AetherBags.Nodes.Layout;
 using Dalamud.Game.Addon.Lifecycle;
 using Dalamud.Game.Addon.Lifecycle.AddonArgTypes;
+using FFXIVClientStructs.FFXIV.Client.UI;
+using FFXIVClientStructs.FFXIV.Client.UI.Agent;
 using FFXIVClientStructs.FFXIV.Component.GUI;
 using KamiToolKit;
 using KamiToolKit.Nodes;
@@ -325,6 +327,12 @@ public class AddonInventoryWindow : NativeAddon
 
     protected override unsafe void OnFinalize(AtkUnitBase* addon)
     {
+        ref var blockingAddonId = ref AgentInventoryContext.Instance()->BlockingAddonId;
+        if (blockingAddonId != 0)
+        {
+            RaptureAtkModule.Instance()->CloseAddon(blockingAddonId);
+        }
+
         Services.AddonLifecycle.UnregisterListener(OnInventoryUpdate);
         addon->UnsubscribeAtkArrayData(1, (int)NumberArrayType.Inventory);