Fix: Fixed issue were old tabs briefly displayed when startup was set…

… to 'open new tab' (files-community#16596)
ferrariofilippo · Dec 15, 2024 · 645d837 · 645d837
1 parent 9e7f8a1
commit 645d837
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/src/Files.App/App.xaml.cs b/src/Files.App/App.xaml.cs
@@ -198,6 +198,7 @@ private async void Window_Closed(object sender, WindowEventArgs args)
 			// Save application state and stop any background activity
 			IUserSettingsService userSettingsService = Ioc.Default.GetRequiredService<IUserSettingsService>();
 			StatusCenterViewModel statusCenterViewModel = Ioc.Default.GetRequiredService<StatusCenterViewModel>();
+			ICommandManager commandManager = Ioc.Default.GetRequiredService<ICommandManager>();
 
 			// A Workaround for the crash (#10110)
 			if (_LastOpenedFlyout?.IsOpen ?? false)
@@ -209,7 +210,10 @@ private async void Window_Closed(object sender, WindowEventArgs args)
 			}
 
 			// Save the current tab list in case it was overwriten by another instance
-			AppLifecycleHelper.SaveSessionTabs();
+			if (userSettingsService.GeneralSettingsService.ContinueLastSessionOnStartUp || userSettingsService.AppSettingsService.RestoreTabsOnStartup)
+				AppLifecycleHelper.SaveSessionTabs();
+			else
+				await commandManager.CloseAllTabs.ExecuteAsync();
 
 			if (OutputPath is not null)
 			{