Merge pull request #3012 from mark-v-d/fix_g70

Fix unintended move when using G42 for G70.

Author: andypugh

src/emc/rs274ngc/interp_g7x.cc

@@ -1043,6 +1043,8 @@ int Interp::convert_g7x(int mode,
 
     double x=settings->current_x;
     double z=settings->current_z;
+    double start_x=x;
+    double start_z=z;
     if(old.distance_mode()==MODE_INCREMENTAL) {
 	if(block->x_flag)
 	    x+=block->x_number;
@@ -1184,6 +1186,9 @@ int Interp::convert_g7x(int mode,
     if(original_block.x_flag) x=original_block.x_number;
     if(original_block.z_flag) z=original_block.z_number;
 
+    settings->current_x=start_x;
+    settings->current_z=start_z;
+
     if(i<=0)
 	ERS("G7X error: I must be greater than zero.");