From 1a2a5010eabf37aaedf956bbea242744061a35a9 Mon Sep 17 00:00:00 2001 From: Katy Coe Date: Fri, 7 Aug 2020 04:57:20 +0200 Subject: [PATCH] GUI: Regression: Don't forget the selected Unity version range when changing image --- Il2CppInspector.GUI/MainWindow.xaml.cs | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/Il2CppInspector.GUI/MainWindow.xaml.cs b/Il2CppInspector.GUI/MainWindow.xaml.cs index ec31867..9b1146b 100644 --- a/Il2CppInspector.GUI/MainWindow.xaml.cs +++ b/Il2CppInspector.GUI/MainWindow.xaml.cs @@ -230,13 +230,17 @@ namespace Il2CppInspectorGUI cboCppUnityVersion.Items.Add(version); cboJsonUnityVersion.Items.Add(version); } + + // Prefer latest Unity versions cboPyUnityVersion.SelectedIndex = cboPyUnityVersion.Items.Count - 1; cboCppUnityVersion.SelectedIndex = cboCppUnityVersion.Items.Count - 1; cboJsonUnityVersion.SelectedIndex = cboJsonUnityVersion.Items.Count - 1; + + // Restore previous selection via value equality if (prevIdaSelection != null) { - cboPyUnityVersion.SelectedItem = prevIdaSelection; - cboCppUnityVersion.SelectedItem = prevCppSelection; - cboJsonUnityVersion.SelectedItem = prevJsonSelection; + cboPyUnityVersion.SelectedItem = cboPyUnityVersion.Items.Cast().First(v => v.Equals(prevIdaSelection)); + cboCppUnityVersion.SelectedItem = cboCppUnityVersion.Items.Cast().First(v => v.Equals(prevCppSelection)); + cboJsonUnityVersion.SelectedItem = cboJsonUnityVersion.Items.Cast().First(v => v.Equals(prevJsonSelection)); } }