From 6d40c08c3c1404a217617c0bd237ba58f1ada76c Mon Sep 17 00:00:00 2001 From: Morilli <35152647+Morilli@users.noreply.github.com> Date: Mon, 11 Mar 2024 22:38:52 +0100 Subject: [PATCH] fix #3675 This looks to just be better on .net framework... --- .../CustomControls/InputRoll/InputRoll.cs | 4 ++++ src/BizHawk.Common/Extensions/CollectionExtensions.cs | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/BizHawk.Client.EmuHawk/CustomControls/InputRoll/InputRoll.cs b/src/BizHawk.Client.EmuHawk/CustomControls/InputRoll/InputRoll.cs index dc25f7edc4..48b431b86b 100644 --- a/src/BizHawk.Client.EmuHawk/CustomControls/InputRoll/InputRoll.cs +++ b/src/BizHawk.Client.EmuHawk/CustomControls/InputRoll/InputRoll.cs @@ -267,7 +267,11 @@ namespace BizHawk.Client.EmuHawk if (_selectedItems.Max(s => s.RowIndex) >= _rowCount) { +#if NETFRAMEWORK + _selectedItems.RemoveAll(i => i.RowIndex >= _rowCount); +#else _selectedItems.RemoveWhere(i => i.RowIndex >= _rowCount); +#endif } RecalculateScrollBars(); diff --git a/src/BizHawk.Common/Extensions/CollectionExtensions.cs b/src/BizHawk.Common/Extensions/CollectionExtensions.cs index 2f787e6a91..a451e199fa 100644 --- a/src/BizHawk.Common/Extensions/CollectionExtensions.cs +++ b/src/BizHawk.Common/Extensions/CollectionExtensions.cs @@ -247,7 +247,7 @@ namespace BizHawk.Common.CollectionExtensions else { foreach (var item in list.Where(item => match(item)) // can't simply cast to Func - .ToList()) // very important + .ToArray()) // very important { list.Remove(item); }