Hotfix: Last dialog never got cancelled because call to cancel was mi…

…ssing.
RenNagasaki · Aug 10, 2024 · 717b1ff · 717b1ff
1 parent d032048
commit 717b1ff
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/Echokraut/Echokraut.csproj b/Echokraut/Echokraut.csproj
@@ -3,7 +3,7 @@
   <Import Project="Dalamud.Plugin.Bootstrap.targets" />
 
   <PropertyGroup>
-    <Version>0.10.5.5</Version>
+    <Version>0.10.5.6</Version>
     <Description>A TTS Dalamud Plugin that breaks the silence! For self hosted TTS Services.</Description>
     <PackageProjectUrl>https://github.com/RenNagasaki/Echokraut</PackageProjectUrl>
     <PackageLicenseExpression>AGPL-3.0-or-later</PackageLicenseExpression>

diff --git a/Echokraut/Helper/AddonTalkHelper.cs b/Echokraut/Helper/AddonTalkHelper.cs
@@ -45,6 +45,12 @@ public AddonTalkHelper(Echokraut plugin, IAddonLifecycle addonLifecycle, IClient
     private void HookIntoFrameworkUpdate()
     {
         addonLifecycle.RegisterListener(AddonEvent.PostDraw, "Talk", OnPostDraw);
+        addonLifecycle.RegisterListener(AddonEvent.PreFinalize, "Talk", OnPreFinalize);
+    }
+
+    private void OnPreFinalize(AddonEvent type, AddonArgs args)
+    {
+        echokraut.Cancel(new EKEventId(0, Enums.TextSource.AddonTalk));
     }
 
     private unsafe void OnPostDraw(AddonEvent type, AddonArgs args)
@@ -90,13 +96,6 @@ private void HandleChange(AddonTalkState state)
         if (voiceNext && DateTime.Now > timeNextVoice.AddSeconds(1))
             voiceNext = false;
 
-        if (state == default)
-        {
-            PlayingHelper.InDialog = false;
-            // The addon was closed
-            echokraut.Cancel(new EKEventId(0, Enums.TextSource.AddonTalk));
-            return;
-        }
         var eventId = DataHelper.EventId(MethodBase.GetCurrentMethod().Name, TextSource.AddonTalk);
 
         // Notify observers that the addon state was advanced
@@ -156,5 +155,6 @@ public void Click(EKEventId eventId)
     public void Dispose()
     {
         addonLifecycle.UnregisterListener(AddonEvent.PostDraw, "Talk", OnPostDraw);
+        addonLifecycle.UnregisterListener(AddonEvent.PreFinalize, "Talk", OnPreFinalize);
     }
 }