Merge pull request epics-modules#60 from EuropeanSpallationSource/rec…

…ord-DLYandSTOP-problem Record: motor record DLY and STOP problem
EuropeanSpallationSource · May 1, 2018 · 90bb52f · 90bb52f
2 parents f3d4e0f + 38186d0
commit 90bb52f
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/motorApp/MotorSrc/motorRecord.cc b/motorApp/MotorSrc/motorRecord.cc
@@ -1804,9 +1804,13 @@ static RTN_STATUS do_work(motorRecord * pmr, CALLBACK_VALUE proc_ind)
             /* Cancel any operations. */
             if (pmr->mip & MIP_HOME)
                 clear_buttons(pmr);
-
-            pmr->mip = MIP_STOP;
-            MARK(M_MIP);
+
+            if (!(pmr->mip & MIP_DELAY_REQ)) {
+               /* When we wait for DLY, keep it. */
+               /* Otherwise the record may lock up */
+                pmr->mip = MIP_STOP;     
+                MARK(M_MIP);
+            }
             INIT_MSG();
             WRITE_MSG(STOP_AXIS, NULL);
             SEND_MSG();