Only abort if the callback chain has been halted

hopsoft · Jan 4, 2024 · d1a6410 · d1a6410
1 parent acbaad6
commit d1a6410
Showing 1 changed file with 4 additions and 5 deletions.
diff --git a/lib/turbo_boost/commands/command_callbacks.rb b/lib/turbo_boost/commands/command_callbacks.rb
@@ -92,14 +92,13 @@ def callback_options(options)
             halt = false # CONTINUE the callback chain
           end
 
-          # `throw :abort` was invoked
-          command.send :aborted!,
-            TurboBoost::Commands::AbortError.new(command: command)
+          if halt # callback chain halted, meaning `throw` was invoked in a callback
+            command.send :aborted!, TurboBoost::Commands::AbortError.new(command: command)
+          end
         rescue UncaughtThrowError => error
           # `throw` was invoked without :abort
           message = "Please use `throw :abort` to abort a command."
-          command.send :aborted!,
-            TurboBoost::Commands::AbortError.new(message, command: command, cause: error)
+          command.send :aborted!, TurboBoost::Commands::AbortError.new(message, command: command, cause: error)
         rescue => error
           # unxpected error in callback
           command.send :errored!, error