Merge branch 'wang_master' of https://gitee.com/wangwanxh/Vocs into wang_master

GcDevicePc/MDIBase.cs

@@ -2045,6 +2045,7 @@ namespace GcDevicePc
                     {
                         SharedSpace.MControl.errstr = "校准时间不够";
                         SharedSpace.MControl.SetOut = false;
+                        SharedSpace.MControl.SetRun = false;
                     }
                 }
                 //else if (SharedSpace.MControl.SetRun == false)
@@ -2107,6 +2108,8 @@ namespace GcDevicePc
             }
             catch (Exception ex)
             {
+                SharedSpace.MControl.SetOut = false;
+                SharedSpace.MControl.SetRun = false;
                 Trace.Write(ex);
             }
         }