fixed: crash if no projects in the list and click create new project, fixed: no project created when no quick project path is assigned first in settings, fixed: if user creates new quick project, but unity fails to start (then project does not get added to list, but folder is generated), now project is added to list temporarily, so can launch it again

Author: unitycoder

Diff for: UnityLauncherPro.sln

@@ -6,6 +6,9 @@ MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UnityLauncherPro", "UnityLauncherPro\UnityLauncherPro.csproj", "{EC78D91A-3E63-4CAA-8BC3-9673A30FDA45}"
 EndProject
 Global
+	GlobalSection(Performance) = preSolution
+		HasPerformanceSessions = true
+	EndGlobalSection
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
 		Release|Any CPU = Release|Any CPU
@@ -22,4 +25,7 @@ Global
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {CD70E364-F81A-402C-A387-1BEB396796A2}
 	EndGlobalSection
+	GlobalSection(Performance) = preSolution
+		HasPerformanceSessions = true
+	EndGlobalSection
 EndGlobal

Diff for: UnityLauncherPro/MainWindow.xaml

@@ -919,7 +919,7 @@
                             </StackPanel>
 
                             <StackPanel Grid.Row="3" Orientation="Horizontal" Margin="0,0,0,4">
-                                <TextBox x:Name="txtRootFolderForNewProjects" MinWidth="300" ToolTip="When you click &quot;Create Project&quot; in main page, new project is generated under this path+UnityVersion (eg. /2017a/)" Padding="0,3,0,0" TextChanged="TxtRootFolderForNewProjects_TextChanged" />
+                                <TextBox x:Name="txtRootFolderForNewProjects" MinWidth="300" ToolTip="Root folder for quick New Projects (so that you dont have to pick project folder every time)" Padding="0,3,0,0" TextChanged="TxtRootFolderForNewProjects_TextChanged" />
                                 <Button x:Name="btnBrowseProjectRootFolder" Content="..." Margin="6,0,0,0" MinWidth="32" Click="BtnBrowseProjectRootFolder_Click" />
                                 <Label Content="Root Folder for New Projects" Foreground="{DynamicResource ThemeButtonForeground}" />
                             </StackPanel>

Diff for: UnityLauncherPro/MainWindow.xaml.cs

@@ -610,24 +610,31 @@ private void BtnAddProjectFolder_Click(object sender, RoutedEventArgs e)
             var folder = Tools.BrowseForOutputFolder("Select Project Folder to Add it Into Projects List");
             if (string.IsNullOrEmpty(folder) == false)
             {
-                // create new project item
-                var p = new Project();
-                p.Path = folder;
-                p.Title = Path.GetFileName(folder);
-                p.Version = Tools.GetProjectVersion(folder);
-                p.Arguments = Tools.ReadCustomLaunchArguments(folder, MainWindow.launcherArgumentsFile);
-                if ((bool)chkShowPlatform.IsChecked == true) p.TargetPlatform = Tools.GetTargetPlatform(folder);
-                if ((bool)chkShowGitBranchColumn.IsChecked == true) p.GITBranch = Tools.ReadGitBranchInfo(folder);
-
-                // add to list
-                projectsSource.Insert(0, p);
-                gridRecent.Items.Refresh();
-                Tools.SetFocusToGrid(gridRecent); // force focus
-                gridRecent.SelectedIndex = 0;
-
+                var proj = GetNewProjectData(folder);
+                AddNewProjectToList(proj);
             }
         }
 
+        Project GetNewProjectData(string folder)
+        {
+            var p = new Project();
+            p.Path = folder;
+            p.Title = Path.GetFileName(folder);
+            p.Version = Tools.GetProjectVersion(folder);
+            p.Arguments = Tools.ReadCustomLaunchArguments(folder, MainWindow.launcherArgumentsFile);
+            if ((bool)chkShowPlatform.IsChecked == true) p.TargetPlatform = Tools.GetTargetPlatform(folder);
+            if ((bool)chkShowGitBranchColumn.IsChecked == true) p.GITBranch = Tools.ReadGitBranchInfo(folder);
+            return p;
+        }
+
+        void AddNewProjectToList(Project proj)
+        {
+            projectsSource.Insert(0, proj);
+            gridRecent.Items.Refresh();
+            Tools.SetFocusToGrid(gridRecent); // force focus
+            gridRecent.SelectedIndex = 0;
+        }
+
         private void BtnClose_Click(object sender, RoutedEventArgs e)
         {
             this.Close();
@@ -1530,6 +1537,15 @@ private void BtnCreateEmptyProjectUnity_Click(object sender, RoutedEventArgs e)
 
         void CreateNewEmptyProject()
         {
+            // first check if quick project path is assigned, if not, need to set it
+            if (Directory.Exists(txtRootFolderForNewProjects.Text) == false)
+            {
+                tabControl.SelectedIndex = 4;
+                this.UpdateLayout();
+                txtRootFolderForNewProjects.Focus();
+                return;
+            }
+
             if (chkAskNameForQuickProject.IsChecked == true)
             {
                 // ask name
@@ -1538,7 +1554,7 @@ void CreateNewEmptyProject()
                 // if in maintab
                 if (tabControl.SelectedIndex == 0)
                 {
-                    newVersion = GetSelectedProject().Version == null ? preferredVersion : GetSelectedProject().Version;
+                    newVersion = GetSelectedProject()?.Version == null ? preferredVersion : GetSelectedProject().Version;
                 }
                 else // unity tab
                 {
@@ -1566,7 +1582,10 @@ void CreateNewEmptyProject()
                     Console.WriteLine("Create project " + NewProject.newVersion + " : " + projectPath);
                     if (string.IsNullOrEmpty(projectPath)) return;
 
-                    Tools.FastCreateProject(NewProject.newVersion, projectPath, NewProject.newProjectName, NewProject.templateZipPath);
+                    var p = Tools.FastCreateProject(NewProject.newVersion, projectPath, NewProject.newProjectName, NewProject.templateZipPath);
+
+                    // add to list (just in case new project fails to start, then folder is already generated..)
+                    if (p != null) AddNewProjectToList(p);
                 }
                 else // false, cancel
                 {
@@ -1586,7 +1605,8 @@ void CreateNewEmptyProject()
                 {
                     newVersion = GetSelectedUnity().Version == null ? preferredVersion : GetSelectedUnity().Version;
                 }
-                Tools.FastCreateProject(newVersion, txtRootFolderForNewProjects.Text);
+                var p = Tools.FastCreateProject(newVersion, txtRootFolderForNewProjects.Text);
+                if (p != null) AddNewProjectToList(p);
             }
 
         }

Diff for: UnityLauncherPro/Tools.cs

@@ -957,27 +957,27 @@ public static string BrowseForOutputFolder(string title)
             return null;
         }
 
-        public static void FastCreateProject(string version, string baseFolder, string projectName = null, string templateZipPath = null)
+        public static Project FastCreateProject(string version, string baseFolder, string projectName = null, string templateZipPath = null)
         {
             // check for base folders in settings tab
             if (string.IsNullOrEmpty(baseFolder) == true)
             {
                 Console.WriteLine("Missing baseFolder value");
-                return;
+                return null;
             }
 
             // check if base folder exists
             if (Directory.Exists(baseFolder) == false)
             {
                 Console.WriteLine("Missing baseFolder: " + baseFolder);
-                return;
+                return null;
             }
 
             // check selected unity version
             if (string.IsNullOrEmpty(version) == true)
             {
                 Console.WriteLine("Missing unity version");
-                return;
+                return null;
             }
 
             string newPath = null;
@@ -988,7 +988,7 @@ public static void FastCreateProject(string version, string baseFolder, string p
                 Console.WriteLine(baseFolder);
                 projectName = GetSuggestedProjectName(version, baseFolder);
                 // failed getting new path a-z
-                if (projectName == null) return;
+                if (projectName == null) return null;
             }
             newPath = Path.Combine(baseFolder, projectName);
 
@@ -1003,10 +1003,12 @@ public static void FastCreateProject(string version, string baseFolder, string p
 
             // launch empty project
             var proj = new Project();
+            proj.Title = projectName;
             proj.Path = Path.Combine(baseFolder, newPath);
             proj.Version = version;
             var proc = LaunchProject(proj);
             ProcessHandler.Add(proj, proc);
+            return proj;
         } // FastCreateProject