Merge pull request #3782 from multigcs/fixing_iocontrol_data_user_request_enable

fixing iocontrol_data.user_request_enable

Author: andypugh

src/emc/task/taskclass.cc

@@ -375,6 +375,7 @@ int Task::emcAuxEstopOn()//EMC_AUX_ESTOP_ON_TYPE
 {
     /* assert an ESTOP to the outside world (thru HAL) */
     iocontrol_data.user_enable_out = 0; //disable on ESTOP_ON
+    iocontrol_data.user_request_enable = 0;
     hal_init_pins(); //resets all HAL pins to safe valuea
     return 0;
 }
@@ -648,6 +649,10 @@ void Task::run(){ // called periodically from emctaskmain.cc
     tool_status = read_tool_inputs();
     if (iocontrol_data.emc_enable_in == 0) //check for estop from HW
         emcioStatus.aux.estop = 1;
-    else
+    else {
         emcioStatus.aux.estop = 0;
+        if (iocontrol_data.user_request_enable == 1) {
+            iocontrol_data.user_request_enable = 0;
+        }
+    }
 }