From 22df60195dcf742096e5c844453593d1945e05e2 Mon Sep 17 00:00:00 2001
From: Alienjack <alienjack@foxmail.com>
Date: Fri, 17 Oct 2025 20:42:22 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BA=91=E5=90=8C=E6=AD=A5?=
 =?UTF-8?q?=E5=AD=98=E6=A1=A3=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Assets/Script/AppMain/UI/OptionUI/OptionUI.cs      |  2 ++
 .../Script/AppMain/UI/OptionUI/OptionUI_SavSlotItem.cs | 10 +++++++++-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/AxibugEmuOnline.Client/Assets/Script/AppMain/UI/OptionUI/OptionUI.cs b/AxibugEmuOnline.Client/Assets/Script/AppMain/UI/OptionUI/OptionUI.cs
index 74bb21e4..fdf7dcba 100644
--- a/AxibugEmuOnline.Client/Assets/Script/AppMain/UI/OptionUI/OptionUI.cs
+++ b/AxibugEmuOnline.Client/Assets/Script/AppMain/UI/OptionUI/OptionUI.cs
@@ -200,6 +200,8 @@ namespace AxibugEmuOnline.Client
 
         public void Pop<T>(List<T> menus, int defaultIndex = 0, Action onClose = null) where T : InternalOptionMenu
         {
+            if (menus == null || menus.Count == 0) return;
+
             if (m_hideTween != null)
             {
                 m_hideTween.Kill(true);
diff --git a/AxibugEmuOnline.Client/Assets/Script/AppMain/UI/OptionUI/OptionUI_SavSlotItem.cs b/AxibugEmuOnline.Client/Assets/Script/AppMain/UI/OptionUI/OptionUI_SavSlotItem.cs
index 02882d66..8035d21c 100644
--- a/AxibugEmuOnline.Client/Assets/Script/AppMain/UI/OptionUI/OptionUI_SavSlotItem.cs
+++ b/AxibugEmuOnline.Client/Assets/Script/AppMain/UI/OptionUI/OptionUI_SavSlotItem.cs
@@ -47,7 +47,15 @@ namespace AxibugEmuOnline.Client
 
         private void SavFile_OnSavSuccessed()
         {
-            MenuData.SavFile.TrySync();
+            if (MenuData.SavFile.GetCurrentState() is SaveFile.SyncedState)
+            {
+                //如果原本就处于已经同步状态，那么此处将直接转换到上传本地文档的状态
+                MenuData.SavFile.FSM.ChangeState<SaveFile.UploadingState>();
+            }
+            else
+            {
+                MenuData.SavFile.TrySync();
+            }
             RefreshUI();
         }