From c55eb71afd7d89f3bcb312d30b20fe25d8a0b4b3 Mon Sep 17 00:00:00 2001 From: MistEO Date: Wed, 13 Apr 2022 21:55:58 +0800 Subject: [PATCH] =?UTF-8?q?fix.=E4=BF=AE=E5=A4=8D=E4=B8=80=E4=B8=AAGUI?= =?UTF-8?q?=E7=9A=84=E9=97=AA=E9=80=80=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/MeoAssistant/Version.h | 2 +- src/MeoAsstGui/Helper/ViewStatusStorage.cs | 20 ++++++++++++++------ 2 files changed, 15 insertions(+), 7 deletions(-) diff --git a/src/MeoAssistant/Version.h b/src/MeoAssistant/Version.h index 46cb9577f3..007ecab490 100644 --- a/src/MeoAssistant/Version.h +++ b/src/MeoAssistant/Version.h @@ -2,5 +2,5 @@ namespace asst { - constexpr static const char* Version = "v3.1.1"; + constexpr static const char* Version = "v3.1.2"; } diff --git a/src/MeoAsstGui/Helper/ViewStatusStorage.cs b/src/MeoAsstGui/Helper/ViewStatusStorage.cs index de24464393..f6749dc442 100644 --- a/src/MeoAsstGui/Helper/ViewStatusStorage.cs +++ b/src/MeoAsstGui/Helper/ViewStatusStorage.cs @@ -42,17 +42,25 @@ namespace MeoAsstGui public static bool Load() { - try + if (File.Exists(_configFilename)) { - using (StreamReader sr = new StreamReader(_configFilename)) + try { - string jsonStr = sr.ReadToEnd(); + using (StreamReader sr = new StreamReader(_configFilename)) + { + string jsonStr = sr.ReadToEnd(); - // 文件存在但为空,会读出来一个null,感觉c#这库有bug,如果是null 就赋值一个空JObject - _viewStatus = (JObject)JsonConvert.DeserializeObject(jsonStr) ?? new JObject(); + // 文件存在但为空,会读出来一个null,感觉c#这库有bug,如果是null 就赋值一个空JObject + _viewStatus = (JObject)JsonConvert.DeserializeObject(jsonStr) ?? new JObject(); + } + } + catch (Exception) + { + _viewStatus = new JObject(); + return false; } } - catch (Exception) + else { _viewStatus = new JObject(); return false;