From ce9b292500066ca4907b8421c5c791aa3646efc5 Mon Sep 17 00:00:00 2001
From: croire <1432593898@qq.com>
Date: Fri, 25 Mar 2022 20:22:40 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3Settings=E8=A2=AB=E5=8D=A0?=
 =?UTF-8?q?=E7=94=A8=E6=97=A0=E6=B3=95=E8=AF=BB=E5=8F=96=E7=9A=84=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 DownKyi.Core/Settings/SettingsManager.cs            | 4 +++-
 DownKyi/ViewModels/Settings/ViewDanmakuViewModel.cs | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/DownKyi.Core/Settings/SettingsManager.cs b/DownKyi.Core/Settings/SettingsManager.cs
index d44485c..f6d19b0 100644
--- a/DownKyi.Core/Settings/SettingsManager.cs
+++ b/DownKyi.Core/Settings/SettingsManager.cs
@@ -57,9 +57,11 @@ namespace DownKyi.Core.Settings
         {
             try
             {
-                StreamReader streamReader = File.OpenText(settingsName);
+                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();
 
 #if DEBUG
 #else
diff --git a/DownKyi/ViewModels/Settings/ViewDanmakuViewModel.cs b/DownKyi/ViewModels/Settings/ViewDanmakuViewModel.cs
index c9fda5b..cdc557b 100644
--- a/DownKyi/ViewModels/Settings/ViewDanmakuViewModel.cs
+++ b/DownKyi/ViewModels/Settings/ViewDanmakuViewModel.cs
@@ -144,7 +144,7 @@ namespace DownKyi.ViewModels.Settings
 
             // 弹幕字体
             string danmakuFont = SettingsManager.GetInstance().GetDanmakuFontName();
-            if (Fonts.Contains(danmakuFont))
+            if (danmakuFont != null && Fonts.Contains(danmakuFont))
             {
                 // 只有系统中存在当前设置的字体，才能显示
                 SelectedFont = danmakuFont;