fix: kill switch page remaining

nventive · Apr 24, 2024 · bc0f5aa · bc0f5aa
1 parent 9660cb7
commit bc0f5aa
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/src/app/ApplicationTemplate.Presentation/CoreStartup.cs b/src/app/ApplicationTemplate.Presentation/CoreStartup.cs
@@ -251,11 +251,6 @@ async Task OnKillSwitchActivated(CancellationToken ct)
 				await navigationController.CloseModal(ct);
 			}
 
-			foreach (var stack in navigationController.State.Sections)
-			{
-				await ClearNavigationStack(ct, stack.Value);
-			}
-
 			await navigationController.NavigateAndClear(ct, () => new KillSwitchPageViewModel());
 
 			Logger.LogInformation("Navigated to kill switch page succesfully.");
@@ -265,6 +260,11 @@ async Task OnKillSwitchDeactivated(CancellationToken ct)
 		{
 			if (navigationController.GetActiveViewModel() is KillSwitchPageViewModel)
 			{
+				foreach (var stack in navigationController.State.Sections)
+				{
+					await ClearNavigationStack(ct, stack.Value);
+				}
+
 				await ExecuteInitialNavigation(ct, serviceProvider);
 				Logger.LogInformation("The kill switch was deactivated.");
 			}