Make sure Block::signal_reserved is emitted consistently

[r2c2.git] / source / libr2c2 / block.cpp

diff --git a/source/libr2c2/block.cpp b/source/libr2c2/block.cpp
index 7c0409d94588caa787f1c73d440189c69de68a0b..25b3bc8b85163d0bfd2ece6a54718f02b840ec6d 100644 (file)
--- a/source/libr2c2/block.cpp
+++ b/source/libr2c2/block.cpp
@@ -1,8 +1,8 @@
 #include <algorithm>
+#include <msp/core/raii.h>
 #include <msp/strings/format.h>
 #include <msp/time/units.h>
 #include "block.h"
-#include "driver.h"
 #include "layout.h"
 #include "route.h"
 #include "trackcircuit.h"
@@ -21,7 +21,9 @@ Block::Block(Layout &l, Track &start):
        turnout_addr(start.get_turnout_address()),
        conflict(false),
        sensor(0),
-       train(0)
+       train(0),
+       pending_train(0),
+       emitting_reserve(false)
 {
        add_track(start);
 
@@ -168,10 +170,19 @@ Block *Block::get_link(unsigned epi) const
 
 bool Block::reserve(Train *t)
 {
-       if(!t || !train)
+       if(!t || !(emitting_reserve ? pending_train : train))
        {
-               train = t;
-               signal_reserved.emit(train);
+               pending_train = t;
+               if(!emitting_reserve)
+               {
+                       while(pending_train!=train)
+                       {
+                               train = pending_train;
+                               SetFlag setf(emitting_reserve);
+                               signal_reserved.emit(train);
+                       }
+               }
+
                return true;
        }
        else
@@ -212,6 +223,11 @@ void Block::determine_id()
        signal_name_changed.emit(name);
 }
 
+DataFile::Statement Block::save_reference() const
+{
+       return (DataFile::Statement("block"), id);
+}
+
 
 Block::Endpoint::Endpoint(Track *t, unsigned e):
        track(t),