upgrade project: handle null installation list, fixes #221

unitycoder · unitycoder · commit ea8edaeee695 · 2026-03-27T17:29:21.000+02:00
diff --git a/UnityLauncherPro/UpgradeWindow.xaml.cs b/UnityLauncherPro/UpgradeWindow.xaml.cs
@@ -19,7 +19,7 @@ public UpgradeWindow(string currentVersion, string projectPath, string commandLi
             txtCurrentVersion.Text = currentVersion;
             txtCurrentPlatform.Text = Tools.GetTargetPlatform(projectPath);
 
-            if (gridAvailableVersions.ItemsSource == null)
+            if (!ReferenceEquals(gridAvailableVersions.ItemsSource, MainWindow.unityInstallationsSource))
             {
                 gridAvailableVersions.ItemsSource = MainWindow.unityInstallationsSource;
             }
@@ -44,7 +44,7 @@ public UpgradeWindow(string currentVersion, string projectPath, string commandLi
                 // find nearest version
                 string nearestVersion = Tools.FindNearestVersion(currentVersion, MainWindow.unityInstalledVersions.Keys.ToList());
 
-                if (nearestVersion != null)
+                if (nearestVersion != null && MainWindow.unityInstallationsSource != null)
                 {
                     // select nearest version
                     for (int i = 0; i < MainWindow.unityInstallationsSource.Count; i++)

Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ public UpgradeWindow(string currentVersion, string projectPath, string commandLi`
`19`	`19`	`txtCurrentVersion.Text = currentVersion;`
`20`	`20`	`txtCurrentPlatform.Text = Tools.GetTargetPlatform(projectPath);`
`21`	`21`
`22`		`- if (gridAvailableVersions.ItemsSource == null)`
	`22`	`+ if (!ReferenceEquals(gridAvailableVersions.ItemsSource, MainWindow.unityInstallationsSource))`
`23`	`23`	`{`
`24`	`24`	`gridAvailableVersions.ItemsSource = MainWindow.unityInstallationsSource;`
`25`	`25`	`}`
`@@ -44,7 +44,7 @@ public UpgradeWindow(string currentVersion, string projectPath, string commandLi`
`44`	`44`	`// find nearest version`
`45`	`45`	`string nearestVersion = Tools.FindNearestVersion(currentVersion, MainWindow.unityInstalledVersions.Keys.ToList());`
`46`	`46`
`47`		`- if (nearestVersion != null)`
	`47`	`+ if (nearestVersion != null && MainWindow.unityInstallationsSource != null)`
`48`	`48`	`{`
`49`	`49`	`// select nearest version`
`50`	`50`	`for (int i = 0; i < MainWindow.unityInstallationsSource.Count; i++)`