Fixed minor code-quality bugs, bumped the version

KinectToVR · Apr 15, 2023 · 69c94f5 · 69c94f5
1 parent 5e61800
commit 69c94f5
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 12 deletions.
diff --git a/Amethyst/Amethyst.csproj b/Amethyst/Amethyst.csproj
@@ -28,8 +28,8 @@
         <Description>Amethyst (Desktop) App</Description>
         <PackageProjectUrl>k2vr.tech</PackageProjectUrl>
         <!--AZ_BUILD_DATA<Version>AZ_BUILD_NUMBER</Version>AZ_BUILD_DATA-->
-        <FileVersion>1.2.1.3</FileVersion>
-        <AssemblyVersion>1.2.1.3</AssemblyVersion>
+        <FileVersion>1.2.1.4</FileVersion>
+        <AssemblyVersion>1.2.1.4</AssemblyVersion>
         <RepositoryUrl>https://github.com/KinectToVR/Amethyst</RepositoryUrl>
     </PropertyGroup>
 

diff --git a/Amethyst/Classes/AppData.cs b/Amethyst/Classes/AppData.cs
@@ -2,13 +2,13 @@
 
 public static class AppData
 {
-    public const uint InternalVersion = 5; // Amethyst version
+    public const uint InternalVersion = 6; // Amethyst version
 
     public const uint ApiVersion = 0; // API version
 
     // Internal version number
     public static (string Display, string Internal)
-        VersionString { get; } = ("1.2.1.3", "AZ_BUILD_NUMBER");
+        VersionString { get; } = ("1.2.1.4", "AZ_BUILD_NUMBER");
 
     // Application settings
     public static AppSettings Settings { get; set; } = new();

diff --git a/Amethyst/Classes/Main.cs b/Amethyst/Classes/Main.cs
@@ -516,7 +516,7 @@ public static async void MainLoop()
     {
         // Warning: this is meant to work as fire-and-forget
         Logger.Info("[Main] Waiting for the start sem to open..");
-        Shared.Events.SemSignalStartMain.WaitOne();
+        Shared.Events.StartMainLoopEvent.WaitOne();
 
         Logger.Info("[Main] Starting the main app loop now...");
 

diff --git a/Amethyst/Classes/Shared.cs b/Amethyst/Classes/Shared.cs
@@ -30,9 +30,9 @@ public static ManualResetEvent
             ReloadInfoPageEvent,
             ReloadPluginsPageEvent;
 
-        public static readonly Semaphore
-            SemSignalStartMain = new(0, 1);
-
+        public static readonly ManualResetEvent
+            StartMainLoopEvent = new(false);
+        
         public static void RequestInterfaceReload(bool all = true)
         {
             if (!General.GeneralTabSetupFinished)

diff --git a/Amethyst/Pages/General.xaml.cs b/Amethyst/Pages/General.xaml.cs
@@ -165,7 +165,7 @@ private async Task Page_LoadedHandler()
         if (!_generalPageLoadedOnce)
         {
             Logger.Info("Basic setup done! Starting the main loop now...");
-            Shared.Events.SemSignalStartMain.Release();
+            Shared.Events.StartMainLoopEvent.Set();
 
             // Try auto-spawning trackers if stated so
             if (Interfacing.IsServiceEndpointPresent && // If the driver's ok

diff --git a/Amethyst/Pages/Plugins.xaml b/Amethyst/Pages/Plugins.xaml
@@ -787,7 +787,6 @@
                                                                FontWeight="SemiBold" FontSize="12"
                                                                Opacity="0.5"
                                                                Text="{x:Bind TrimString(Publisher, 30), Mode=OneWay}"
-                                                               Tapped="{x:Bind ShowDeviceFolder, Mode=OneWay}"
                                                                ToolTipService.ToolTip="{x:Bind Folder, Mode=OneWay}"
                                                                ToolTipService.Placement="Bottom" />
                                                 </StackPanel>

diff --git a/Amethyst/Schedulers/ShutdownController.cs b/Amethyst/Schedulers/ShutdownController.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Collections.Immutable;
 using System.Linq;
 using System.Threading.Tasks;
 using Amethyst.Classes;
@@ -27,8 +28,11 @@ public static async Task ExecuteAllTasks()
         // First run all queued tasks waiting for us
         Logger.Info("Running all actions queued for shutdown...");
 
+        Logger.Info("Preparing an immutable task list...");
+        var queuedShutdownTasks = ShutdownTasks.ToImmutableList();
+
         Logger.Info("Executing tasks marked as priority...");
-        foreach (var task in ShutdownTasks.Where(x => x.Priority))
+        foreach (var task in queuedShutdownTasks.Where(x => x.Priority))
         {
             Logger.Info($"Starting task with name \"{task.Name}\"...");
             try
@@ -45,7 +49,7 @@ public static async Task ExecuteAllTasks()
         }
 
         Logger.Info("Executing all other tasks now...");
-        foreach (var task in ShutdownTasks.Where(x => !x.Priority))
+        foreach (var task in queuedShutdownTasks.Where(x => !x.Priority))
         {
             Logger.Info($"Starting task with name \"{task.Name}\"...");
             try