fix #27

problem was when calling via ui, not function level

when called from ui it would unsubscribe from statechanged before the state was set to completed

Author: Jaksuhn

SomethingNeedDoing/Managers/MacroScheduler.cs

@@ -329,22 +329,15 @@ public async void StopMacro(string macroId)
         if (_macroStates.TryGetValue(macroId, out var state))
         {
             state.CancellationSource.Cancel();
-            state.Macro.StateChanged -= OnMacroStateChanged;
             state.Macro.State = MacroState.Completed;
 
+            // rest of the cleanup will be handled by OnMacroStateChanged
             UnregisterFunctionTriggers(state.Macro);
             await SetPluginStates(state.Macro, true);
 
-            // Execute cleanup functions
-            _cleanupManager.ExecuteCleanup(macroId, "Stopped");
-
             if (C.PropagateControlsToChildren)
                 foreach (var child in _macroHierarchy.GetChildMacros(macroId).ToList())
                     StopMacro(child.Id);
-
-            if (_macroStates.TryRemove(macroId, out var removedState))
-                removedState.Dispose();
-            _enginesByMacroId.TryRemove(macroId, out _);
         }
     }
 
@@ -505,8 +498,15 @@ private void OnMacroStateChanged(object? sender, MacroStateChangedEventArgs e)
                     tempMacro.StateChanged -= OnMacroStateChanged;
             }
 
-            StopMacro(e.MacroId); // handle local cancellations/state
-            CleanupMacro(e.MacroId); // cleanup triggers/state
+            if (_macroStates.TryRemove(e.MacroId, out var state))
+            {
+                UnregisterFunctionTriggers(state.Macro);
+                state.CancellationSource.Cancel();
+                state.CancellationSource.Dispose();
+                state.Macro.StateChanged -= OnMacroStateChanged;
+            }
+
+            _enginesByMacroId.TryRemove(e.MacroId, out _);
         }
     }