From cc138a42df59bf898aaf5601e3ab4e99fc50897f Mon Sep 17 00:00:00 2001 From: uye <99072975+ABA2396@users.noreply.github.com> Date: Wed, 27 Nov 2024 15:44:37 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E6=96=B0=E4=B8=8B=E8=BD=BD=E7=9A=84=20M?= =?UTF-8?q?AA=20=E4=BC=9A=E5=9C=A8=E5=8A=A0=E8=BD=BD=E5=85=B3=E5=8D=A1?= =?UTF-8?q?=E6=97=B6=E6=8A=A5=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/MaaWpfGui/Services/StageManager.cs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/MaaWpfGui/Services/StageManager.cs b/src/MaaWpfGui/Services/StageManager.cs index 47e64a2dac..f5f9f7f071 100644 --- a/src/MaaWpfGui/Services/StageManager.cs +++ b/src/MaaWpfGui/Services/StageManager.cs @@ -162,7 +162,7 @@ namespace MaaWpfGui.Services return activity; } - private void MergePermanentAndActivityStages(JObject activity) + private void MergePermanentAndActivityStages(JObject? activity) { var tempStage = InitializeDefaultStages(); @@ -174,9 +174,9 @@ namespace MaaWpfGui.Services // bool curResourceVerParsed = SemVersion.TryParse( // tasksJsonClient?["ResourceVersion"]?.ToString() ?? tasksJson?["ResourceVersion"]?.ToString() ?? string.Empty, // SemVersionStyles.AllowLowerV, out var curResourceVersionObj); - var resourceCollection = InitializeResourceCollection(activity[clientType]?["resourceCollection"]); + var resourceCollection = InitializeResourceCollection(activity?[clientType]?["resourceCollection"]); - if (activity[clientType] != null) + if (activity?[clientType] != null) { ParseActivityStages(activity[clientType], tempStage, curVerParsed, curVersionObj, isDebugVersion); }