[bot] AutoMerging: merge all upstream's changes:

* https://github.com/leiurayer/downkyi: 修复程序反复读取设置文件的问题
hellopony · Jul 27, 2023 · b4221e7 · b4221e7
2 parents ad8e4ea + 3331737
commit b4221e7
Showing 1 changed file with 15 additions and 5 deletions.
diff --git a/src/DownKyi.Core/Settings/SettingsManager.cs b/src/DownKyi.Core/Settings/SettingsManager.cs
@@ -55,13 +55,23 @@ private SettingsManager()
         /// <returns></returns>
         private AppSettings GetSettings()
         {
+            if (appSettings != null) { return appSettings; }
+
             try
             {
-                FileStream fileStream = new FileStream(settingsName, FileMode.Open, FileAccess.Read, FileShare.ReadWrite);
-                StreamReader streamReader = new StreamReader(fileStream, System.Text.Encoding.UTF8);
-                string jsonWordTemplate = streamReader.ReadToEnd();
-                streamReader.Close();
-                fileStream.Close();
+                //FileStream fileStream = new FileStream(settingsName, FileMode.Open, FileAccess.Read, FileShare.ReadWrite);
+                //StreamReader streamReader = new StreamReader(fileStream, System.Text.Encoding.UTF8);
+                //string jsonWordTemplate = streamReader.ReadToEnd();
+                //streamReader.Close();
+                //fileStream.Close();
+                string jsonWordTemplate = string.Empty;
+                using (var stream = new FileStream(settingsName, FileMode.Open, FileAccess.Read, FileShare.ReadWrite | FileShare.Delete))
+                {
+                    using (var reader = new StreamReader(stream, System.Text.Encoding.UTF8))
+                    {
+                        jsonWordTemplate = reader.ReadToEnd();
+                    }
+                }
 
 #if DEBUG
 #else