From: ian <ian>
Date: Sun, 8 Jun 2008 20:18:31 +0000 (+0000)
Subject: set movposcomb=-1 earlier so we actually move things
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ijackson/git?a=commitdiff_plain;h=7226109cc77936d3b0f2706a0b75a61eda3826ba;p=trains.git

set movposcomb=-1 earlier so we actually move things
---

diff --git a/hostside/resolve.c b/hostside/resolve.c
index e7045ab..eb17fd7 100644
--- a/hostside/resolve.c
+++ b/hostside/resolve.c
@@ -356,6 +356,9 @@ static int resolve_complete_main(void) {
 	  movpos_unreserve(d->motion);
 	  d->motion= 0;
 	}
+	if (!d->res_movposset)
+	  d->movposcomb= -1;
+
 	ErrorCode ec= movpos_reserve(d,-1,&d->motion,target,-1);
 	if (ec) {
 	  ouprintf("resolution movpos-change-failed %s/%s %s\n",
@@ -626,9 +629,5 @@ void resolve_motioncheck(void) {
   FOR_SEG
     if (seg->moving) return;
 
-  FOR_SEG
-    if (seg->i->n_poscombs>1 && !seg->res_movposset)
-      seg->movposcomb= -1;
-
   sta_finalising_done();
 }