From: Ian Jackson <ian@liberator.relativity.greenend.org.uk>
Date: Wed, 5 Jan 2011 00:12:50 +0000 (+0000)
Subject: realtime: fix recently-introduced bug where wrong sense of ec is checked
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ijackson/git?a=commitdiff_plain;h=0f4173e0aa34c6525e95ce818efa48ec54177c22;p=trains.git

realtime: fix recently-introduced bug where wrong sense of ec is checked
---

diff --git a/hostside/safety.c b/hostside/safety.c
index 94d4778..423a343 100644
--- a/hostside/safety.c
+++ b/hostside/safety.c
@@ -479,7 +479,7 @@ static int nose_nextseg(TrackLocation *t, TrackAdvanceContext *c,
 	(interferer->owner || interferer->pred_present)) {
       int does;
       ec= segment_interferer_does(c,t->seg,interferer, &does);
-      if (!ec) return ec;
+      if (ec) return ec;
 
       if (does) {
 	if (interferer->owner && interferer->owner != u->train)
diff --git a/hostside/x.gdb b/hostside/x.gdb
index 7ae7f69..9df20e3 100644
--- a/hostside/x.gdb
+++ b/hostside/x.gdb
@@ -1,6 +1,8 @@
 file ./realtime
 set args -S+realtime.log shinkansen.speeds.record santafe.speeds.record bavarian.speeds.record homes.record
 
+#break nose_nextseg if sevent_lno >= 35505
+
 break vdie
 break nmra_errchk_fail
 #break predict_problem