fix: 完善配置锁

snolab · Apr 11, 2021 · 654d201 · 654d201
1 parent 790d5b4
commit 654d201
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 3 deletions.
diff --git a/.gitignore b/.gitignore
@@ -21,3 +21,4 @@ Tools/new-version*.txt
 *.user.ahk
 *.user.md
 *.user.ignores
+*.user.ignores.txt
diff --git a/Core/CapsLockX-Update.ahk b/Core/CapsLockX-Update.ahk
@@ -20,6 +20,7 @@ global T_DownloadUpdate := CapsLockX_Config("Core", "T_DownloadUpdate", 1, "自
 global CLXU_Updated :=1
 global CLXU_Fail := 2
 global CLXU_AlreadyLatest := 4
+Sleep, 5000
 if(T_CheckUpdate)
     CapsLockX_检查更新()
 Sleep, 5000

diff --git a/Core/CapslockX-Config.ahk b/Core/CapslockX-Config.ahk
@@ -1,6 +1,7 @@
 ; 保存为 save with UTF8 with DOM
 
 if (!!CapsLockXConfigPath){
+    CapsLockX_Config("_NOTICE_", "ENCODING_USING", "UTF16_LE", "")
     清洗为_UTF16_WITH_BOM_型编码(CapsLockXConfigPath)
     ; 基本设定
     ; [Core]
@@ -23,13 +24,21 @@ if (!!CapsLockXConfigPath){
 }
 
 清洗为_UTF16_WITH_BOM_型编码(path){
+    FileRead CLX配置锁状态, CapsLockX_Config.lock
+    if(CLX配置锁状态){
+        return
+    }
     static 锁 := 0
     if(锁)
         Return
     锁 := 1
+    FileAppend, 1, CapsLockX_Config.lock
     FileRead ModuleCode, %path%
-    FileDelete %path%
-    FileAppend %ModuleCode%, %path%, UTF-16
+    if(ModuleCode){
+        FileDelete %path%
+        FileAppend %ModuleCode%, %path%, UTF-16
+    }
+    FileDelete, CapsLockX_Config.lock
     锁 := 0
 }
 CapsLockX_ConfigSet(field, varName, setValue, comment := ""){

diff --git a/Modules/应用-定时任务.ahk b/Modules/应用-定时任务.ahk
@@ -24,7 +24,7 @@ Return
     ; IfMsgBox, Cancel
     ; return
 
-    global T_ScheduleTasks_UsingHighPerformanceTime := CapsLockX_Config("ScheduleTasks", "T_UsingHighPerformanceTime", "0", "")
+    global T_ScheduleTasks_UsingHighPerformanceTime := CapsLockX_Config("ScheduleTasks", "T_UsingHighPerformanceTime", "0", "已经配置过高精度时间的Flag")
     if(T_ScheduleTasks_UsingHighPerformanceTime)
         return
     ToolTip, 定时任务开启，正在为您配置系统高精度时间