浏览代码

修复进入工厂模式失败时,计数不停止的问题。

JeffWang 2 年之前
父节点
当前提交
bdeed4a3d0
共有 1 个文件被更改,包括 3 次插入2 次删除
  1. 3 2
      FactoryTool_CShare/Views/OperationPanel.cs

+ 3 - 2
FactoryTool_CShare/Views/OperationPanel.cs

@@ -1696,7 +1696,7 @@ namespace MOKA_Factory_Tools
                 catch (Exception ex)
                 catch (Exception ex)
                 {
                 {
                     MessageBox.Show(ex.Message);
                     MessageBox.Show(ex.Message);
-                    return;
+                    goto stop;
                 }
                 }
             }
             }
             for (int i = 0; i <= FunctionSettingNow.EnterFactoryRetry; i++)
             for (int i = 0; i <= FunctionSettingNow.EnterFactoryRetry; i++)
@@ -1716,7 +1716,7 @@ namespace MOKA_Factory_Tools
                 ErrMsg = string.Format("{0} Enter factory fail, Please check the problem", SN);
                 ErrMsg = string.Format("{0} Enter factory fail, Please check the problem", SN);
                 Log.WriteErrorLog(ErrMsg);
                 Log.WriteErrorLog(ErrMsg);
                 ShowVerifyDelegate(ErrMsg);
                 ShowVerifyDelegate(ErrMsg);
-                return;
+                goto stop;
             }
             }
 
 
             //烧录SN
             //烧录SN
@@ -5180,6 +5180,7 @@ namespace MOKA_Factory_Tools
             {
             {
                 GetLocalKeysCount();
                 GetLocalKeysCount();
             }
             }
+        stop:
             timer1.Stop();
             timer1.Stop();
             usingTime = 0;
             usingTime = 0;
             EnableText(SNText);
             EnableText(SNText);