From 29146e8baa7de3f5c6cbefaeee2b98bc19d5a98e Mon Sep 17 00:00:00 2001 From: zzyyyl Date: Tue, 14 Feb 2023 20:09:51 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=A5=87=E6=80=AA?= =?UTF-8?q?=E7=9A=84=E5=90=88=E5=B9=B6=E5=86=B2=E7=AA=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit fix 0e5eae1060c529a6bbc74a8e6ecf4f21945de213 --- src/MaaWpfGui/Main/SettingsViewModel.cs | 8 -------- 1 file changed, 8 deletions(-) diff --git a/src/MaaWpfGui/Main/SettingsViewModel.cs b/src/MaaWpfGui/Main/SettingsViewModel.cs index 06d1fec44a..53d30dd31b 100644 --- a/src/MaaWpfGui/Main/SettingsViewModel.cs +++ b/src/MaaWpfGui/Main/SettingsViewModel.cs @@ -2323,16 +2323,8 @@ namespace MaaWpfGui set { SetAndNotify(ref _customStageCode, value); -<<<<<<< HEAD ViewStatusStorage.Set("GUI.CustomStageCode", value.ToString()); _taskQueueViewModel.CustomStageCode = value; -======= - var mainModel = _container.Get(); - mainModel.RemainingSanityStageDisplay1 = UseRemainingSanityStage && !value; - mainModel.RemainingSanityStageDisplay2 = UseRemainingSanityStage && value; - mainModel.CustomStageCode = value; - ViewStatusStorage.Set("GUI.CustomStageCode", value.ToString()); ->>>>>>> stable } }