Fix: Fixed COMException when removing focus from the path bar (files-…

…community#14356)
marcelwgn · Jan 5, 2024 · cebdba5 · cebdba5
1 parent 71742c3
commit cebdba5
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 0 deletions.
diff --git a/src/Files.App/App.xaml.cs b/src/Files.App/App.xaml.cs
@@ -167,6 +167,8 @@ await MainWindow.Instance.DispatcherQueue.EnqueueOrInvokeAsync(()
 		/// </summary>
 		private void Window_Activated(object sender, WindowActivatedEventArgs args)
 		{
+			AppModel.IsMainWindowClosed = false;
+
 			// TODO(s): Is this code still needed?
 			if (args.WindowActivationState != WindowActivationState.CodeActivated ||
 				args.WindowActivationState != WindowActivationState.PointerActivated)

diff --git a/src/Files.App/UserControls/AddressToolbar.xaml.cs b/src/Files.App/UserControls/AddressToolbar.xaml.cs
@@ -95,6 +95,9 @@ private void VisiblePath_KeyDown(object _, KeyRoutedEventArgs e)
 		}
 		private void VisiblePath_LostFocus(object _, RoutedEventArgs e)
 		{
+			if (App.AppModel.IsMainWindowClosed)
+				return;
+
 			var element = FocusManager.GetFocusedElement(MainWindow.Instance.Content.XamlRoot);
 			if (element is FlyoutBase or AppBarButton or Popup)
 				return;