From 9966af0e730a78155f629745142b441db365d5a9 Mon Sep 17 00:00:00 2001
From: Katy Coe <djkaty@users.noreply.github.com>
Date: Fri, 24 Jul 2020 17:01:55 +0200
Subject: [PATCH] AppModel: Prefer the latest Unity header versions instead of
 the earliest

---
 Il2CppInspector.Common/Model/AppModel.cs | 2 +-
 Il2CppInspector.GUI/MainWindow.xaml.cs   | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Il2CppInspector.Common/Model/AppModel.cs b/Il2CppInspector.Common/Model/AppModel.cs
index 7c9c61b..d078f27 100644
--- a/Il2CppInspector.Common/Model/AppModel.cs
+++ b/Il2CppInspector.Common/Model/AppModel.cs
@@ -117,7 +117,7 @@ namespace Il2CppInspector.Model
             TargetCompiler = compiler == CppCompilerType.BinaryFormat ? CppCompiler.GuessFromImage(ILModel.Package.BinaryImage) : compiler;
 
             // Determine Unity version and get headers
-            UnityHeaders = unityVersion != null ? UnityHeaders.GetHeadersForVersion(unityVersion) : UnityHeaders.GuessHeadersForBinary(ILModel.Package.Binary)[0];
+            UnityHeaders = unityVersion != null ? UnityHeaders.GetHeadersForVersion(unityVersion) : UnityHeaders.GuessHeadersForBinary(ILModel.Package.Binary).Last();
             UnityVersion = unityVersion ?? UnityHeaders.VersionRange.Min;
 
             Console.WriteLine($"Selected Unity version(s) {UnityHeaders.VersionRange} (types: {UnityHeaders.TypeHeaderResource.VersionRange}, APIs: {UnityHeaders.APIHeaderResource.VersionRange})");
diff --git a/Il2CppInspector.GUI/MainWindow.xaml.cs b/Il2CppInspector.GUI/MainWindow.xaml.cs
index 639c53e..b6eb5f9 100644
--- a/Il2CppInspector.GUI/MainWindow.xaml.cs
+++ b/Il2CppInspector.GUI/MainWindow.xaml.cs
@@ -209,8 +209,8 @@ namespace Il2CppInspectorGUI
                 cboUnityVersion.Items.Add(version);
                 cboCppUnityVersion.Items.Add(version);
             }
-            cboUnityVersion.SelectedIndex = 0;
-            cboCppUnityVersion.SelectedIndex = 0;
+            cboUnityVersion.SelectedIndex = cboUnityVersion.Items.Count - 1;
+            cboCppUnityVersion.SelectedIndex = cboCppUnityVersion.Items.Count - 1;
             if (prevSelection != null) {
                 cboUnityVersion.SelectedItem = prevSelection;
                 cboCppUnityVersion.SelectedItem = prevCppSelection;