修复保存情景后无法即使显示

修复无法正常显示重复设置的按键
MakesYT · Nov 10, 2023 · 30dabe4 · 30dabe4
1 parent 953a6d5
commit 30dabe4
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/Core/SDKs/CustomScenario/CustomScenarioManger.cs b/Core/SDKs/CustomScenario/CustomScenarioManger.cs
@@ -126,10 +126,8 @@ public static void Init()
 
     public static void Save(SDKs.CustomScenario.CustomScenario scenario)
     {
-        if (scenario.UUID is null)
+        if (!CustomScenarios.Contains(scenario))
         {
-            var s = Guid.NewGuid().ToString();
-            scenario.UUID = s;
             CustomScenarios.Add(scenario);
         }
 

diff --git a/uToolkitopia/Controls/HotKeyShow.cs b/uToolkitopia/Controls/HotKeyShow.cs
@@ -49,7 +49,14 @@ public enum KeyTypeE
         typeof(HotKeyModel), typeof(HotKeyShow),
         new PropertyMetadata(null, (o, args) =>
         {
-            HotKeyModelChanged((HotKeyModel)args.NewValue, (HotKeyShow)o);
+            var argsNewValue = (HotKeyModel)args.NewValue;
+            if (argsNewValue is null)
+            {
+                return;
+            }
+
+            ((HotKeyShow)o).HotKeyName = argsNewValue.SignName;
+            HotKeyModelChanged(argsNewValue, (HotKeyShow)o);
         }));
 
     public static readonly DependencyProperty KeyTypeProperty = DependencyProperty.Register(nameof(KeyType),