Safeguard TopMenuBar iterating

LaughingLeader-DOS2-Mods · Jul 23, 2021 · 426cb94 · 426cb94
1 parent 8d7e3dc
commit 426cb94
Showing 1 changed file with 12 additions and 2 deletions.
diff --git a/GUI/MainWindow.xaml.cs b/GUI/MainWindow.xaml.cs
@@ -238,9 +238,19 @@ private void RegisterBindings()
 				this.InputBindings.Add(keyBinding);
 			}
 
-			foreach (var entry in TopMenuBar.Items.Cast<MenuItem>())
+			foreach (var item in TopMenuBar.Items)
 			{
-				menuItems.Add((string)entry.Header, entry);
+				if(item is MenuItem entry)
+				{
+					if (entry.Header is string label)
+					{
+						menuItems.Add(label, entry);
+					}
+					else if (!String.IsNullOrWhiteSpace(entry.Name))
+					{
+						menuItems.Add(entry.Name, entry);
+					}
+				}
 			}
 
 			//Generating menu items