Fixes #581 by making eager close protection less agressive

fluentribbon · Jul 3, 2018 · c41103d · c41103d
1 parent ad5c70f
commit c41103d
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/Changelog.md b/Changelog.md
@@ -57,6 +57,7 @@
   - [#564](../../issues/564) - Gallery overflow panel (with menu items) doesn't close when clicking once in the application
   - [#572](../../issues/572) - KeyTip.Keys Position
   - [#573](../../issues/573) - Empty context menu on controls and ribbon
+  - [#581](../../issues/581) - StackOverflow Exception when trying to access ApplicationMenu while RibbonMenu is minimized
 
 - ### Enhancements
   - [#516](../../issues/516) - Add options to hide the row containing RibbonTabItems  

diff --git a/Fluent.Ribbon/Services/PopupService.cs b/Fluent.Ribbon/Services/PopupService.cs
@@ -274,8 +274,14 @@ public static void OnDismissPopup(object sender, DismissPopupEventArgs e)
                     && ribbonTabControl.IsMinimized
                     && IsAncestorOf(control as DependencyObject, e.OriginalSource as DependencyObject))
                 {
-                    Mouse.Capture(control as IInputElement, CaptureMode.SubTree);
+                    // Don't prevent closing if the new target is an ApplicationMenu (#581)
+                    if (Mouse.Captured is ApplicationMenu)
+                    {
+                        control.IsDropDownOpen = false;
+                        return;
+                    }
 
+                    Mouse.Capture(control as IInputElement, CaptureMode.SubTree);
                     return;
                 }