lib/adhearsion/call_controller.rb in adhearsion-2.0.0.rc3 vs lib/adhearsion/call_controller.rb in adhearsion-2.0.0.rc4

@@ -67,10 +67,11 @@
       logger.info "Call was hung up"
     rescue SyntaxError, StandardError => e
       Events.trigger :exception, [e, logger]
     ensure
       after_call
+      logger.debug "Finished executing controller #{self.inspect}"
     end
 
     def run
       instance_exec(&block) if block
     end
@@ -143,10 +144,10 @@
       else
         options.delete :async
       end
       block_until_resumed
       join_command = call.join target, options
-      waiter = join_command.other_call_id || join_command.mixer_name
+      waiter = join_command.call_id || join_command.mixer_name
       if async
         call.wait_for_joined waiter
       else
         call.wait_for_unjoined waiter
       end