From 3788021898389f64187c66dfeb1a7f1182e08f9f Mon Sep 17 00:00:00 2001
From: Chandler Cox <mr.chandlercox@gmail.com>
Date: Sat, 15 Mar 2025 18:41:53 -0500
Subject: [PATCH] Fix issue with re-loading scene and toolstip not updating.

---
 Source/Editor/States/ChangingScenesState.cs | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

diff --git a/Source/Editor/States/ChangingScenesState.cs b/Source/Editor/States/ChangingScenesState.cs
index 17fa30ff7..e1a95e6ab 100644
--- a/Source/Editor/States/ChangingScenesState.cs
+++ b/Source/Editor/States/ChangingScenesState.cs
@@ -164,10 +164,21 @@ namespace FlaxEditor.States
         {
             Assert.AreEqual(Guid.Empty, _lastSceneFromRequest, "Invalid state.");
 
-            // Bind events
-            Level.SceneLoaded += OnSceneEvent;
-            Level.SceneLoadError += OnSceneEvent;
-            Level.SceneUnloaded += OnSceneEvent;
+            // Bind events, only bind loading event and error if re-loading the same scene to avoid issues.
+            if (_scenesToUnload.Count == 1 && _scenesToLoad.Count == 1)
+            {
+                if (_scenesToLoad[0] == _scenesToUnload[0].ID)
+                {
+                    Level.SceneLoaded += OnSceneEvent;
+                    Level.SceneLoadError += OnSceneEvent;
+                }
+            }
+            else
+            {
+                Level.SceneLoaded += OnSceneEvent;
+                Level.SceneLoadError += OnSceneEvent;
+                Level.SceneUnloaded += OnSceneEvent;
+            }
 
             // Push scenes changing requests
             for (int i = 0; i < _scenesToUnload.Count; i++)