Only try to dismiss popup if next captured item is not a context menu

#439 and #616
fluentribbon · Aug 25, 2018 · 1293440 · 1293440
1 parent 863d1ea
commit 1293440
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/Fluent.Ribbon/Services/PopupService.cs b/Fluent.Ribbon/Services/PopupService.cs
@@ -386,7 +386,11 @@ public static void OnContextMenuClosing(object sender, ContextMenuEventArgs e)
             {
                 Debug.WriteLine("Context menu closing");
                 control.IsContextMenuOpened = false;
-                RaiseDismissPopupEvent(control, DismissPopupMode.MouseNotOver);
+
+                if (Mouse.Captured is System.Windows.Controls.ContextMenu == false)
+                {
+                    RaiseDismissPopupEvent(e.OriginalSource, DismissPopupMode.MouseNotOver);
+                }
             }
         }