Skip to content

G
GC_Branch
Commit c4156cc6 authored by wangjunqiang's avatar wangjunqiang
Browse files
Options

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

parents 403a62e9 e9f78a53
Show whitespace changes
Inline Side-by-side
Showing with 3 additions and 0 deletions
GcDevicePc/MDIBase.cs
View file @ c4156cc6
...@@ -2045,6 +2045,7 @@ namespace GcDevicePc ...@@ -2045,6 +2045,7 @@ namespace GcDevicePc
{ {
SharedSpace.MControl.errstr = "校准时间不够"; SharedSpace.MControl.errstr = "校准时间不够";
SharedSpace.MControl.SetOut = false; SharedSpace.MControl.SetOut = false;
SharedSpace.MControl.SetRun = false;
} }
} }
//else if (SharedSpace.MControl.SetRun == false) //else if (SharedSpace.MControl.SetRun == false)
...@@ -2107,6 +2108,8 @@ namespace GcDevicePc ...@@ -2107,6 +2108,8 @@ namespace GcDevicePc
} }
catch (Exception ex) catch (Exception ex)
{ {
SharedSpace.MControl.SetOut = false;
SharedSpace.MControl.SetRun = false;
Trace.Write(ex); Trace.Write(ex);
} }
} }
......
dll/CKVocAnalyzer.dll
View file @ c4156cc6
No preview for this file type
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment