From 0e0843bad8ef84a9dbe3c764dfc0cb6b00e6863a Mon Sep 17 00:00:00 2001
From: ZouJin <zoujin.dev@exlb.org>
Date: Mon, 10 Jun 2024 00:00:33 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=8F=AF=E8=83=BD=E5=92=8CL2?=
 =?UTF-8?q?D=E6=8F=92=E4=BB=B6=E5=BC=95=E8=B5=B7=E7=9A=84=E9=94=99?=
 =?UTF-8?q?=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 VPet-Simulator.Core/Display/Main.xaml.cs   | 11 +++--------
 VPet-Simulator.Core/Display/MainDisplay.cs |  6 ++++--
 2 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/VPet-Simulator.Core/Display/Main.xaml.cs b/VPet-Simulator.Core/Display/Main.xaml.cs
index 2d1cec3..26be8af 100644
--- a/VPet-Simulator.Core/Display/Main.xaml.cs
+++ b/VPet-Simulator.Core/Display/Main.xaml.cs
@@ -102,17 +102,12 @@ namespace VPet_Simulator.Core
         public void Load_4_Start(IGraph startUPGraph = null)
         {
             IGraph ig = startUPGraph ?? Core.Graph.FindGraph(Core.Graph.FindName(GraphType.StartUP), AnimatType.Single, Core.Save.Mode);
-            ig ??= Core.Graph.FindGraph(Core.Graph.FindName(GraphType.Default), AnimatType.Single, Core.Save.Mode);
+            ig ??= Core.Graph.FindGraph(Core.Graph.FindName(GraphType.Default), AnimatType.Single, Core.Save.Mode);            
             Task.Run(() =>
             {
                 ig.Run(PetGrid, () =>
-                {
-                    IsWorking = true;
-                    Dispatcher.Invoke(() =>
-                    {
-                        PetGrid.Tag = ig;
-                        PetGrid2.Tag = ig;
-                    });
+                {                    
+                    IsWorking = true;                    
                     DisplayNomal();
                 });
             });
diff --git a/VPet-Simulator.Core/Display/MainDisplay.cs b/VPet-Simulator.Core/Display/MainDisplay.cs
index 4f17d35..6efd2c3 100644
--- a/VPet-Simulator.Core/Display/MainDisplay.cs
+++ b/VPet-Simulator.Core/Display/MainDisplay.cs
@@ -505,7 +505,8 @@ namespace VPet_Simulator.Core
             if (graph.Equals(PetGridTag))
             {
                 petgridcrlf = true;
-                ((IGraph)(PetGrid2Tag)).Stop(true);
+                if(PetGrid2Tag is IGraph ig)
+                    ig.Stop(true);
                 Dispatcher.Invoke(() =>
                 {
                     PetGrid.Visibility = Visibility.Visible;
@@ -517,7 +518,8 @@ namespace VPet_Simulator.Core
             else if (graph.Equals(PetGrid2Tag))
             {
                 petgridcrlf = false;
-                ((IGraph)(PetGridTag)).Stop(true);
+                if (PetGridTag is IGraph ig)
+                    ig.Stop(true);
                 Dispatcher.Invoke(() =>
                 {
                     PetGrid2.Visibility = Visibility.Visible;