1

Src/Unity/Scripts/Scenes/SceneService.cs

@@ -234,6 +234,7 @@ namespace BITKit.SceneManagement
 
 		public async UniTask UnloadSceneAsync(string sceneName, CancellationToken cancellationToken)
 		{
+			await UniTask.SwitchToMainThread();
 			OnUnloadScene?.Invoke(sceneName);
 			
 			await Task.Delay(100, destroyCancellationToken);
@@ -246,7 +247,7 @@ namespace BITKit.SceneManagement
 			SceneManager.LoadScene(1);
 			
 			destroyCancellationToken.ThrowIfCancellationRequested();
-		
+			await UniTask.SwitchToMainThread();
 			OnSceneUnloaded?.Invoke(sceneName);
 		}
 

Src/Unity/Scripts/Scenes/UX/UXSceneLoading.cs

@@ -6,11 +6,12 @@ using BITKit.UX;
 using UnityEngine;
 using Cysharp.Threading.Tasks;
 using System.Threading.Tasks;
+using BITKit.SceneManagement;
 using Task = System.Threading.Tasks.Task;
 
 // ReSharper disable Unity.NoNullPropagation
 
-namespace BITKit.SceneManagement.UX
+namespace BITKit.UX
 {
 	public class UXSceneLoading : MonoBehaviour
 	{
@@ -30,14 +31,13 @@ namespace BITKit.SceneManagement.UX
 		{
 			_cancellationToken = gameObject.GetCancellationTokenOnDestroy();
 		}
-
 		private void Start()
 		{
+			DI.Inject(this);
 			sceneService.OnLoadScene += OnLoadScene;
 			sceneService.OnSceneLoadProgress+=OnSceneLoadProgress;
 			sceneService.OnSceneLoaded += OnSceneLoaded;
 		}
-
 		private void Update()
 		{
 			_currentProgress = Mathf.Lerp(_currentProgress, _progress, Time.deltaTime * 10);
@@ -50,11 +50,11 @@ namespace BITKit.SceneManagement.UX
 			sceneService.OnSceneLoaded -= OnSceneLoaded;
 		}
 
+	
 		private void OnSceneLoadProgress(string arg1, float arg2)
 		{
 			_progress = arg2;
 		}
-
 		private void OnLoadScene(string obj)
 		{
 			sceneNameLabel?.Set(obj);
@@ -62,6 +62,7 @@ namespace BITKit.SceneManagement.UX
 		}
 		private async void OnSceneLoaded(string obj)
 		{
+		
 			if(autoDestroyAfterLoaded is false)return;
 			backgroundImage.SetActive(false);
 			try