From cd0ebbdd505d7e507a386a73218b20f2895c528d Mon Sep 17 00:00:00 2001 From: Dan Walmsley Date: Thu, 9 Apr 2020 16:06:34 -0300 Subject: [PATCH] Revert "use a copy of lists as we will be removing from the list inside the loop." This reverts commit 38f8dc73b30d668b3489c621c0d9828842e880d6. --- src/Avalonia.Native/IAvnAppMenu.cs | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/src/Avalonia.Native/IAvnAppMenu.cs b/src/Avalonia.Native/IAvnAppMenu.cs index d31ee24b26..50485456db 100644 --- a/src/Avalonia.Native/IAvnAppMenu.cs +++ b/src/Avalonia.Native/IAvnAppMenu.cs @@ -71,13 +71,11 @@ namespace Avalonia.Native.Interop } } - var menuItems = _menuItems.ToList(); - for (int i = 0; i < menu.Items.Count; i++) { IAvnAppMenuItem nativeItem = null; - if (i >= menuItems.Count || menu.Items[i] != menuItems[i].ManagedMenuItem) + if (i >= _menuItems.Count || menu.Items[i] != _menuItems[i].ManagedMenuItem) { if (_menuItemLookup.TryGetValue(menu.Items[i], out nativeItem)) { @@ -90,7 +88,7 @@ namespace Avalonia.Native.Interop } else { - nativeItem = menuItems[i]; + nativeItem = _menuItems[i]; Remove(nativeItem); } @@ -102,9 +100,9 @@ namespace Avalonia.Native.Interop InsertAt(i, nativeItem); } - for (int i = menu.Items.Count; i < menuItems.Count; i++) + for (int i = menu.Items.Count; i < _menuItems.Count; i++) { - Remove(menuItems[i]); + Remove(_menuItems[i]); } return disposables;