diff --git a/Assets/MackySoft/MackySoft.Navigathena/Runtime/SceneManagement/SceneNavigator/StandardSceneNavigator.cs b/Assets/MackySoft/MackySoft.Navigathena/Runtime/SceneManagement/SceneNavigator/StandardSceneNavigator.cs index 82f0a54..b338ee0 100644 --- a/Assets/MackySoft/MackySoft.Navigathena/Runtime/SceneManagement/SceneNavigator/StandardSceneNavigator.cs +++ b/Assets/MackySoft/MackySoft.Navigathena/Runtime/SceneManagement/SceneNavigator/StandardSceneNavigator.cs @@ -327,7 +327,7 @@ async UniTask TryFinalizeAndUnloadCurrentScene (SceneHistoryEntry currentSceneEn // NOTE: If the current scene is the only scene, create an empty scene to prevent an exception from being thrown when unloading. if (SceneManager.sceneCount < 2) { - SceneManager.CreateScene("Navigathena Blank"); + await NavigathenaBlankSceneIdentifier.Instance.CreateHandle().Load(cancellationToken: cancellationToken); } await m_CurrentSceneState.Value.Handle.Unload(m_SceneProgressFactory.CreateProgress(progressDataStore, progress), cancellationToken); diff --git a/Assets/MackySoft/MackySoft.Navigathena/Runtime/SceneManagement/SceneNavigatorHelper.cs b/Assets/MackySoft/MackySoft.Navigathena/Runtime/SceneManagement/SceneNavigatorHelper.cs index a9a59fc..78e4625 100644 --- a/Assets/MackySoft/MackySoft.Navigathena/Runtime/SceneManagement/SceneNavigatorHelper.cs +++ b/Assets/MackySoft/MackySoft.Navigathena/Runtime/SceneManagement/SceneNavigatorHelper.cs @@ -67,6 +67,9 @@ public static async UniTask LoadSceneAndGetEntryPoint (ISceneIdentif Scene loadedScene = await sceneHandle.Load(sceneProgressFactory.CreateProgress(progressDataStore, progress), cancellationToken); cancellationToken.ThrowIfCancellationRequested(); + await NavigathenaBlankSceneIdentifier.Instance.CreateHandle().Unload(cancellationToken: cancellationToken); + cancellationToken.ThrowIfCancellationRequested(); + var sceneEntryPoint = loadedScene.GetComponentInScene(true); return new SceneState(scene, sceneHandle, sceneEntryPoint); }