fixed several issues, add pre-launch/finalize steps to game presets

Maassoft · Nov 13, 2022 · dc2f7f4 · dc2f7f4
1 parent 4522067
commit dc2f7f4
Show file tree

Hide file tree

Showing 12 changed files with 296 additions and 136 deletions.
diff --git a/ColorControl/ColorControl.csproj b/ColorControl/ColorControl.csproj
@@ -19,8 +19,8 @@
 	<PublisherName>Maassoft</PublisherName>
 	<Company>Maassoft</Company>
 	<ApplicationRevision>0</ApplicationRevision>
-	<ApplicationVersion>8.0.0.0</ApplicationVersion>
-	<Version>8.0.0.0</Version>
+	<ApplicationVersion>8.1.0.0</ApplicationVersion>
+	<Version>8.1.0.0</Version>
 	<UseApplicationTrust>false</UseApplicationTrust>
 	<PublishWizardCompleted>true</PublishWizardCompleted>
 	<BootstrapperEnabled>false</BootstrapperEnabled>

diff --git a/ColorControl/Common/Utils.cs b/ColorControl/Common/Utils.cs
@@ -426,6 +426,12 @@ public static async Task<List<PnpDev>> GetPnpDevices(string deviceName)
 
         public static T WaitForTask<T>(Task<T> task)
         {
+            if (ConsoleOpened)
+            {
+                task.Wait();
+                return task.Result;
+            }
+
             while (task != null && (task.Status < TaskStatus.WaitingForChildrenToComplete))
             {
                 Thread.Sleep(10);
@@ -436,6 +442,12 @@ public static T WaitForTask<T>(Task<T> task)
 
         public static void WaitForTask(System.Threading.Tasks.Task task)
         {
+            if (ConsoleOpened)
+            {
+                task.Wait();
+                return;
+            }
+
             while (task != null && (task.Status < TaskStatus.WaitingForChildrenToComplete))
             {
                 Thread.Sleep(10);
@@ -733,7 +745,7 @@ public static Process GetProcessByName(string name, bool skipCurrent = true)
             return null;
         }
 
-        public static void StartProcess(string fileName, string arguments = null, bool hidden = false, bool wait = false, bool setWorkingDir = false, bool elevate = false, uint affinityMask = 0, uint priorityClass = 0)
+        public static Process StartProcess(string fileName, string arguments = null, bool hidden = false, bool wait = false, bool setWorkingDir = false, bool elevate = false, uint affinityMask = 0, uint priorityClass = 0)
         {
             var process = Process.Start(new ProcessStartInfo(fileName, arguments)
             {
@@ -757,6 +769,8 @@ public static void StartProcess(string fileName, string arguments = null, bool h
             {
                 process.WaitForExit();
             }
+
+            return process;
         }
 
         internal static void SetProcessAffinity(int processId, uint affinityMask)

diff --git a/ColorControl/Forms/ListViewColumnSorter.cs b/ColorControl/Forms/ListViewColumnSorter.cs
@@ -64,7 +64,9 @@ public int Compare(object x, object y)
             else
             {
                 // Compare the two items
-                compareResult = ObjectCompare.Compare(listviewX.SubItems[ColumnToSort].Text, listviewY.SubItems[ColumnToSort].Text);
+                var subItemTextX = listviewX.SubItems.Count > ColumnToSort ? listviewX.SubItems[ColumnToSort].Text : string.Empty;
+                var subItemTextY = listviewY.SubItems.Count > ColumnToSort ? listviewY.SubItems[ColumnToSort].Text : string.Empty;
+                compareResult = ObjectCompare.Compare(subItemTextX, subItemTextY);
             }
 
             // Calculate correct return value based on object comparison

diff --git a/ColorControl/Forms/MessageForms.cs b/ColorControl/Forms/MessageForms.cs
@@ -198,7 +198,7 @@ public static List<FieldDefinition> ShowDialog(string caption, IEnumerable<Field
 
                         if (field.Values != null && field.Values.Any())
                         {
-                            var compoundValue = field.Value is int ? (int)field.Value : (int)((uint)field.Value);
+                            var compoundValue = field.Value is uint ? (int)(uint)field.Value : (int)field.Value;
                             var enumValue = 1;
                             foreach (var value in field.Values)
                             {

diff --git a/ColorControl/MainForm.Designer.cs b/ColorControl/MainForm.Designer.cs