projects: handle null values for sorting columns, sort projects by modified date (so that it doesnt depend on registry order)

Author: unitycoder

UnityLauncherPro/GetProjects.cs

@@ -14,7 +14,6 @@ public static class GetProjects
         // convert target platform name into valid buildtarget platform name, NOTE this depends on unity version, now only 2019 and later are supported
         public static Dictionary<string, string> remapPlatformNames = new Dictionary<string, string> { { "StandaloneWindows64", "Win64" }, { "StandaloneWindows", "Win" }, { "Android", "Android" }, { "WebGL", "WebGL" } };
 
-        // TODO separate scan and folders
         public static List<Project> Scan(bool getGitBranch = false, bool getPlasticBranch = false, bool getArguments = false, bool showMissingFolders = false, bool showTargetPlatform = false)
         {
             List<Project> projectsFound = new List<Project>();
@@ -152,6 +151,8 @@ public static List<Project> Scan(bool getGitBranch = false, bool getPlasticBranc
             } // for each registry root
 
             // NOTE sometimes projects are in wrong order, seems to be related to messing up your unity registry, the keys are received in created order (so if you had removed/modified them manually, it might return wrong order instead of 0 - 40)
+            // thats why need to sort projects list by modified date
+            projectsFound.Sort((x, y) => y.Modified.Value.CompareTo(x.Modified.Value));
 
             return projectsFound;
         } // Scan()

UnityLauncherPro/MainWindow.xaml.cs

@@ -2750,10 +2750,18 @@ public int Compare(Object a, Object b)
                     case "Project":
                         return direction == ListSortDirection.Ascending ? ((Project)a).Title.CompareTo(((Project)b).Title) : ((Project)b).Title.CompareTo(((Project)a).Title);
                     case "Version":
+                        // handle null values
+                        if (((Project)a).Version == null && ((Project)b).Version == null) return 0;
+                        if (((Project)a).Version == null) return direction == ListSortDirection.Ascending ? -1 : 1;
+                        if (((Project)b).Version == null) return direction == ListSortDirection.Ascending ? 1 : -1;
                         return direction == ListSortDirection.Ascending ? Tools.VersionAsInt(((Project)a).Version).CompareTo(Tools.VersionAsInt(((Project)b).Version)) : Tools.VersionAsInt(((Project)b).Version).CompareTo(Tools.VersionAsInt(((Project)a).Version));
                     case "Path":
                         return direction == ListSortDirection.Ascending ? ((Project)a).Path.CompareTo(((Project)b).Path) : ((Project)b).Path.CompareTo(((Project)a).Path);
                     case "Modified":
+                        // handle null values
+                        if (((Project)a).Modified == null && ((Project)b).Modified == null) return 0;
+                        if (((Project)a).Modified == null) return direction == ListSortDirection.Ascending ? -1 : 1;
+                        if (((Project)b).Modified == null) return direction == ListSortDirection.Ascending ? 1 : -1;
                         return direction == ListSortDirection.Ascending ? ((DateTime)((Project)a).Modified).CompareTo(((Project)b).Modified) : ((DateTime)((Project)b).Modified).CompareTo(((Project)a).Modified);
                     case "Arguments":
                         // handle null values
@@ -2913,6 +2921,7 @@ private void menuInstallLastAPK_Click(object sender, RoutedEventArgs e)
                 }
             }
 
+            // launch app
             if (string.IsNullOrEmpty(packageName) == false)
             {
                 pars += $" && adb shell monkey -p {packageName} 1";