Extra safety code around the recent menu popups. Non-repeatable error…

…, but a couple of safety checks should improve reliability in edge cases.
RickStrahl · Jun 21, 2018 · 59f95a1 · 59f95a1
1 parent ea50af2
commit 59f95a1
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 10 deletions.
diff --git a/MarkdownMonster/MainWindow.xaml b/MarkdownMonster/MainWindow.xaml
@@ -219,7 +219,7 @@
                 </MenuItem>
 
                 <MenuItem Name="ButtonRecentFiles" Header="Recent Documents"
-                          SubmenuOpened="ButtonRecentFiles_SubmenuOpened"  Click="Button_Handler" >
+                          SubmenuOpened="ButtonRecentFiles_SubmenuOpened"  >
                     <MenuItem>.</MenuItem>
                 </MenuItem>
 

diff --git a/MarkdownMonster/MainWindow.xaml.cs b/MarkdownMonster/MainWindow.xaml.cs
@@ -512,6 +512,8 @@ public void UpdateRecentDocumentsContextMenu(RecentFileDropdownModes mode)
 
             if (mode == RecentFileDropdownModes.MenuDropDown)
                 ButtonRecentFiles.Items.Clear();
+            else if (mode == RecentFileDropdownModes.ToolbarDropdown)
+                ToolbarButtonRecentFiles.ContextMenu = contextMenu;
 
             var icon = new AssociatedIcons();
             MenuItem mi = null;
@@ -636,9 +638,7 @@ public void UpdateRecentDocumentsContextMenu(RecentFileDropdownModes mode)
                     else
                         ButtonRecentFiles.Items.Add(mi);
                 }
-
-                if (mode == RecentFileDropdownModes.ToolbarDropdown)
-                    ToolbarButtonRecentFiles.ContextMenu = contextMenu;                
+
             }
 
         }
@@ -1961,12 +1961,12 @@ public void Button_Handler(object sender, RoutedEventArgs e)
                 editor.MarkdownDocument.CurrentText = markdown;
                 PreviewBrowser.PreviewMarkdown();
             }
-            else if (button == ButtonRecentFiles)
-            {
-                var mi = button as MenuItem;
-                UpdateRecentDocumentsContextMenu(RecentFileDropdownModes.MenuDropDown);
-                mi.IsSubmenuOpen = true;
-            }
+            //else if (button == ButtonRecentFiles)
+            //{
+            //    var mi = button as MenuItem;
+            //    UpdateRecentDocumentsContextMenu(RecentFileDropdownModes.MenuDropDown);
+            //    mi.IsSubmenuOpen = true;
+            //}
             else if (button == ToolbarButtonRecentFiles)
             {
                 var mi = button as Button;