Skip to content

Commit 4320ec2

Browse files
committed
axis.c avoid shortcircuit in axis_jog_abort_all()
formerly, the logic expression shortcircuit could result in failure to abort *all* axes
1 parent 55b163c commit 4320ec2

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

src/emc/motion/axis.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -338,7 +338,7 @@ bool axis_jog_abort_all(bool immediate)
338338
int n;
339339
bool aborted = 0;
340340
for (n = 0; n < EMCMOT_MAX_AXIS; n++) {
341-
aborted = aborted || axis_jog_abort(n, immediate);
341+
if (axis_jog_abort(n, immediate)) {aborted = 1;}
342342
}
343343
return aborted;
344344
}

0 commit comments

Comments
 (0)