Merge pull request #3642 from LinuxCNC/2.9_#2460

axis.py: restore mdi queuing provision       #2460

Author: andypugh

src/emc/usr_intf/axis/scripts/axis.py

@@ -979,7 +979,6 @@ def manual_ok(do_poll=True):
 This means this function returns True when the mdi tab is visible."""
     if do_poll: s.poll()
     if s.task_state != linuxcnc.STATE_ON: return False
-    if running(): return 0
     return s.interp_state == linuxcnc.INTERP_IDLE or (s.task_mode == linuxcnc.MODE_MDI and s.queued_mdi_commands < vars.max_queued_mdi_commands.get())
 
 # If LinuxCNC is not already in one of the modes given, switch it to the
@@ -3243,8 +3242,7 @@ def get_jog_mode():
 jog_cont  = [False] * linuxcnc.MAX_JOINTS
 jogging   = [0]     * linuxcnc.MAX_JOINTS
 def jog_on(a, b):
-    if not manual_ok(): return
-    if not manual_tab_visible(): return
+    if not manual_ok() or not manual_tab_visible() or running(): return
     if a < 3 or a > 5:
         if vars.metric.get(): b = b / 25.4
         b = from_internal_linear_unit(b)