chizui/Il2CppInspectorRedux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

GUI: Don't crash when opening a 2nd binary with no overlapping possible Unity versions

Browse Source
This commit is contained in:
Katy Coe
2020-08-07 05:03:26 +02:00
parent 1a2a5010ea
commit 58cd9abe02
1 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
Il2CppInspector.GUI/MainWindow.xaml.cs
View File

@@ -231,17 +231,20 @@ namespace Il2CppInspectorGUI
cboJsonUnityVersion.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 // Restore previous selection via value equality
if (prevIdaSelection != null) { if (prevIdaSelection != null) {
cboPyUnityVersion.SelectedItem = cboPyUnityVersion.Items.Cast<UnityHeaders>().First(v => v.Equals(prevIdaSelection)); cboPyUnityVersion.SelectedItem = cboPyUnityVersion.Items.Cast<UnityHeaders>().FirstOrDefault(v => v.Equals(prevIdaSelection));
cboCppUnityVersion.SelectedItem = cboCppUnityVersion.Items.Cast<UnityHeaders>().First(v => v.Equals(prevCppSelection)); cboCppUnityVersion.SelectedItem = cboCppUnityVersion.Items.Cast<UnityHeaders>().FirstOrDefault(v => v.Equals(prevCppSelection));
cboJsonUnityVersion.SelectedItem = cboJsonUnityVersion.Items.Cast<UnityHeaders>().First(v => v.Equals(prevJsonSelection)); cboJsonUnityVersion.SelectedItem = cboJsonUnityVersion.Items.Cast<UnityHeaders>().FirstOrDefault(v => v.Equals(prevJsonSelection));
} }
// Prefer latest Unity versions if there was no previous selection or it's now invalid
if (cboPyUnityVersion.SelectedItem == null)
cboPyUnityVersion.SelectedIndex = cboPyUnityVersion.Items.Count - 1;
if (cboCppUnityVersion.SelectedItem == null)
cboCppUnityVersion.SelectedIndex = cboCppUnityVersion.Items.Count - 1;
if (cboJsonUnityVersion.SelectedItem == null)
cboJsonUnityVersion.SelectedIndex = cboJsonUnityVersion.Items.Count - 1;
} }
private IEnumerable<CheckboxNode> deconstructNamespaces(IEnumerable<string> input) { private IEnumerable<CheckboxNode> deconstructNamespaces(IEnumerable<string> input) {