GoaLitiuM/FlaxEngine
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'fix-toolstip-scene-reload' of https://github.com/Tryibion/FlaxEngine into Tryibion-fix-toolstip-scene-reload

Browse Source
This commit is contained in:
Wojtek Figat
2025-03-17 12:07:00 +01:00
parent 62354e81e2 3788021898
commit e11b381c13
1 changed files with 15 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
Source/Editor/States/ChangingScenesState.cs
View File

@@ -164,10 +164,21 @@ namespace FlaxEditor.States
{ {
Assert.AreEqual(Guid.Empty, _lastSceneFromRequest, "Invalid state."); Assert.AreEqual(Guid.Empty, _lastSceneFromRequest, "Invalid state.");
// Bind events // Bind events, only bind loading event and error if re-loading the same scene to avoid issues.
Level.SceneLoaded += OnSceneEvent; if (_scenesToUnload.Count == 1 && _scenesToLoad.Count == 1)
Level.SceneLoadError += OnSceneEvent; {
Level.SceneUnloaded += OnSceneEvent; 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 // Push scenes changing requests
for (int i = 0; i < _scenesToUnload.Count; i++) for (int i = 0; i < _scenesToUnload.Count; i++)