浏览代码

修复进入工厂模式失败后,计时不停止的Bug。

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

+ 1 - 1
FactoryTool_CShare/Models/StructList.cs

@@ -402,7 +402,7 @@ namespace MOKA_Factory_Tools
         public bool EDIDPIDWrite_YesNo { get; set; }
         public bool EDIDPIDWrite_YesNo { get; set; }
         public bool EDIDModeNameWrite_YesNo { get; set; }
         public bool EDIDModeNameWrite_YesNo { get; set; }
         public bool FVPWrite_YesNo { get; set; }
         public bool FVPWrite_YesNo { get; set; }
-		public bool DolbyWrite_YesNo { get;set; }
+	public bool DolbyWrite_YesNo { get;set; }
         #region getmessage接口对应需要在线获取的key类型;
         #region getmessage接口对应需要在线获取的key类型;
         public bool DIDWrite_YesNo { get; set; }
         public bool DIDWrite_YesNo { get; set; }
         public bool MacWrite_YesNo { get; set; }
         public bool MacWrite_YesNo { get; set; }

+ 3 - 2
FactoryTool_CShare/Views/OperationPanel.cs

@@ -1707,7 +1707,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++)
@@ -1727,7 +1727,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
@@ -4905,6 +4905,7 @@ namespace MOKA_Factory_Tools
             {
             {
                 GetLocalKeysCount();
                 GetLocalKeysCount();
             }
             }
+        stop:
             timer1.Stop();
             timer1.Stop();
             usingTime = 0;
             usingTime = 0;
             EnableText(SNText);
             EnableText(SNText);