浏览代码

Fix null reference when menu has 'separators'

tznind 1 年之前
父节点
当前提交
8dcf8cdc2b
共有 1 个文件被更改,包括 5 次插入0 次删除
  1. 5 0
      Terminal.Gui/Views/Menu.cs

+ 5 - 0
Terminal.Gui/Views/Menu.cs

@@ -1844,6 +1844,11 @@ namespace Terminal.Gui {
 			var c = ((uint)kb.Key & (uint)Key.CharMask);
 			var c = ((uint)kb.Key & (uint)Key.CharMask);
 			for (int i = 0; i < children.Length; i++) {
 			for (int i = 0; i < children.Length; i++) {
 				var mi = children [i];
 				var mi = children [i];
+
+				if(mi == null) {
+					continue;
+				}
+
 				int p = mi.Title.IndexOf (MenuBar.HotKeySpecifier.ToString ());
 				int p = mi.Title.IndexOf (MenuBar.HotKeySpecifier.ToString ());
 				if (p != -1 && p + 1 < mi.Title.GetRuneCount ()) {
 				if (p != -1 && p + 1 < mi.Title.GetRuneCount ()) {
 					if (Char.ToUpperInvariant ((char)mi.Title [p + 1]) == c) {
 					if (Char.ToUpperInvariant ((char)mi.Title [p + 1]) == c) {