From 351f7f8d338b682eeba3106db8a3c0528fab6155 Mon Sep 17 00:00:00 2001
From: geondo55 <102933884+geondo55@users.noreply.github.com>
Date: Tue, 1 Jul 2025 10:57:32 +0900
Subject: [PATCH] =?UTF-8?q?=EB=8D=B0=EC=9D=B4=ED=84=B0=20=EC=97=B0?=
 =?UTF-8?q?=EB=8F=99=20=EA=B0=9D=EC=B2=B4=20=EB=B9=84=ED=99=9C=EC=84=B1?=
 =?UTF-8?q?=ED=99=94=20=EC=98=A4=EB=A5=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Assets/Scripts/Studio/TwinObject/StaticObject/Equipment.cs  | 5 ++++-
 Assets/Scripts/Studio/TwinObject/StaticObject/Port.cs       | 6 +++++-
 Assets/Scripts/Studio/TwinObject/StaticObject/Stacker.cs    | 5 ++++-
 .../Scripts/Studio/TwinObject/StaticObject/StackerCrane.cs  | 5 ++++-
 4 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/Assets/Scripts/Studio/TwinObject/StaticObject/Equipment.cs b/Assets/Scripts/Studio/TwinObject/StaticObject/Equipment.cs
index af1c302e..2dee2835 100644
--- a/Assets/Scripts/Studio/TwinObject/StaticObject/Equipment.cs
+++ b/Assets/Scripts/Studio/TwinObject/StaticObject/Equipment.cs
@@ -61,7 +61,10 @@ namespace Studio
 
         private void OnDisable()
         {
-            ManagerHub.instance.Get<RunManager>().onRun -= OnPlayStart;
+            RunManager runManager = ManagerHub.instance.Get<RunManager>();
+            if (runManager == null)
+                return;
+            runManager.onRun -= OnPlayStart;
             if (curType == null)
                 return;
             StudioService.instance.RemoveTypeIdListener(curType, transform.name);
diff --git a/Assets/Scripts/Studio/TwinObject/StaticObject/Port.cs b/Assets/Scripts/Studio/TwinObject/StaticObject/Port.cs
index b0474f2f..bd065917 100644
--- a/Assets/Scripts/Studio/TwinObject/StaticObject/Port.cs
+++ b/Assets/Scripts/Studio/TwinObject/StaticObject/Port.cs
@@ -61,9 +61,13 @@ namespace Studio
 
         private void OnDisable()
         {
-            ManagerHub.instance.Get<RunManager>().onRun -= OnPlayStart;
+            RunManager runManager = ManagerHub.instance.Get<RunManager>();
+            if(runManager == null) 
+                return;
+            runManager.onRun -= OnPlayStart;
             if (curType == null)
                 return;
+            if(StudioService.instance != null)
             StudioService.instance.RemoveTypeIdListener(curType, transform.name);
         }
     }
diff --git a/Assets/Scripts/Studio/TwinObject/StaticObject/Stacker.cs b/Assets/Scripts/Studio/TwinObject/StaticObject/Stacker.cs
index 412e0ae6..40bc5806 100644
--- a/Assets/Scripts/Studio/TwinObject/StaticObject/Stacker.cs
+++ b/Assets/Scripts/Studio/TwinObject/StaticObject/Stacker.cs
@@ -60,7 +60,10 @@ namespace Studio
 
         private void OnDisable()
         {
-            ManagerHub.instance.Get<RunManager>().onRun -= OnPlayStart;
+            RunManager runManager = ManagerHub.instance.Get<RunManager>();
+            if (runManager == null)
+                return;
+            runManager.onRun -= OnPlayStart;
             if (curType == null)
                 return;
             StudioService.instance.RemoveTypeIdListener(curType, transform.name);
diff --git a/Assets/Scripts/Studio/TwinObject/StaticObject/StackerCrane.cs b/Assets/Scripts/Studio/TwinObject/StaticObject/StackerCrane.cs
index 567ba7c2..085a6969 100644
--- a/Assets/Scripts/Studio/TwinObject/StaticObject/StackerCrane.cs
+++ b/Assets/Scripts/Studio/TwinObject/StaticObject/StackerCrane.cs
@@ -173,7 +173,10 @@ namespace Studio.Staic.STKC
         private void OnDestroy()
         {
             isAnimation = false;
-            ManagerHub.instance.Get<RunManager>().onRun -= OnPlayStart;
+            RunManager runManager = ManagerHub.instance.Get<RunManager>();
+            if (runManager == null)
+                return;
+            runManager.onRun -= OnPlayStart;
             if (curType == null)
                 return;
             StudioService.instance.RemoveTypeIdListener(curType, transform.name);
-- 
2.48.1.windows.1