chiark / gitweb /
set movposcomb=-1 earlier so we actually move things
authorian <ian>
Sun, 8 Jun 2008 20:18:31 +0000 (20:18 +0000)
committerian <ian>
Sun, 8 Jun 2008 20:18:31 +0000 (20:18 +0000)
hostside/resolve.c

index e7045ab33828ff3ebfb99aae942e2810ae315d3a..eb17fd76b900dd2cd441c2f8adcd6f27d3b1f007 100644 (file)
@@ -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();
 }