Ensure Conveyor::on_block_end gets called last

diff --git a/src/modules/robot/Block.cpp b/src/modules/robot/Block.cpp
index aa4fa51..03f00ec 100644 (file)
--- a/src/modules/robot/Block.cpp
+++ b/src/modules/robot/Block.cpp
@@ -236,4 +236,7 @@ void Block::release()
 {
     if (--this->times_taken <= 0)
         THEKERNEL->call_event(ON_BLOCK_END, this);
+
+    // ensure conveyor gets called last
+    THEKERNEL->conveyor->on_block_end(this);
 }

diff --git a/src/modules/robot/Conveyor.cpp b/src/modules/robot/Conveyor.cpp
index 8d3be00..2373f60 100644 (file)
--- a/src/modules/robot/Conveyor.cpp
+++ b/src/modules/robot/Conveyor.cpp
@@ -28,7 +28,6 @@ Conveyor::Conveyor(){
 
 void Conveyor::on_module_loaded(){
     register_for_event(ON_IDLE);
-    register_for_event(ON_BLOCK_END);
 }
 
 // Delete blocks here, because they can't be deleted in interrupt context ( see Block.cpp:release )