From fc4c45ef1df7443103c1184df32adc71dda3ee54 Mon Sep 17 00:00:00 2001
From: KeatonTheBot <keaton@ryujinx.app>
Date: Sat, 29 Aug 2026 17:33:11 -0500
Subject: [PATCH] UI: Fix XCI file trimmer selection crash

---
 .../UI/Windows/XCITrimmerWindow.axaml.cs      | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/src/Ryujinx/UI/Windows/XCITrimmerWindow.axaml.cs b/src/Ryujinx/UI/Windows/XCITrimmerWindow.axaml.cs
index 4481a5e15..1795bc1eb 100644
--- a/src/Ryujinx/UI/Windows/XCITrimmerWindow.axaml.cs
+++ b/src/Ryujinx/UI/Windows/XCITrimmerWindow.axaml.cs
@@ -6,6 +6,8 @@ using Ryujinx.Ava.Common.Locale;
 using Ryujinx.Ava.UI.ViewModels;
 using Ryujinx.UI.Common.Models;
 using System;
+using System.Collections.Generic;
+using System.Linq;
 using System.Threading.Tasks;
 
 namespace Ryujinx.Ava.UI.Windows
@@ -81,20 +83,17 @@ namespace Ryujinx.Ava.UI.Windows
 
         private void OnSelectionChanged(object sender, SelectionChangedEventArgs e)
         {
-            foreach (object content in e.AddedItems)
+            List<XCITrimmerFileModel> added = [.. e.AddedItems.OfType<XCITrimmerFileModel>()];
+            List<XCITrimmerFileModel> removed = [.. e.RemovedItems.OfType<XCITrimmerFileModel>()];
+
+            foreach (XCITrimmerFileModel applicationData in added)
             {
-                if (content is XCITrimmerFileModel applicationData)
-                {
-                    ViewModel.Select(applicationData);
-                }
+                ViewModel.Select(applicationData);
             }
 
-            foreach (object content in e.RemovedItems)
+            foreach (XCITrimmerFileModel applicationData in removed)
             {
-                if (content is XCITrimmerFileModel applicationData)
-                {
-                    ViewModel.Deselect(applicationData);
-                }
+                ViewModel.Deselect(applicationData);
             }
         }
     }