Merge pull request #176 from PhantomGamers/dev

PhantomGamers · Nov 20, 2023 · e40799d · e40799d
2 parents 7abf79f + b6d437b
commit e40799d
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 4 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -27,7 +27,6 @@ jobs:
           dotnet-version: 7.x
           cache: true
           cache-dependency-path: '**/packages.lock.json'
-      - run: dotnet restore --locked-mode
       - name: Set OS_ARG environment variable
         run: |
           if ("${{ runner.os }}" -eq "Windows") {

diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -53,7 +53,6 @@ jobs:
           dotnet-version: 7.x
           cache: true
           cache-dependency-path: '**/packages.lock.json'
-      - run: dotnet restore --locked-mode
       - name: Set OS_ARG environment variable
         run: |
           if ("${{ runner.os }}" -eq "Windows") {

diff --git a/SFP/Models/Utils.cs b/SFP/Models/Utils.cs
@@ -1,6 +1,7 @@
 #region
 
 using System.Diagnostics;
+using System.Drawing;
 
 #endregion
 
@@ -63,12 +64,26 @@ public static List<string> GetCommandLine(Process? process)
         return new List<string>();
     }
 
+    // ReSharper disable once InconsistentNaming
     public static string ConvertARGBtoRGBA(string argb)
     {
-        if (argb.Length != 9 || !argb.StartsWith("#"))
+        if (!argb.StartsWith("#"))
         {
-            throw new ArgumentException("Invalid ARGB format");
+            var color = Color.FromName(argb);
+            if (color is { A: 0, R: 0, G: 0, B: 0 })
+            {
+                Log.Logger.Warn("Could not get color from {ColorName}", argb);
+                return argb;
+            }
+            argb = $"#{color.ToArgb():x8}";
+        }
+
+        if (argb.Length is not 9)
+        {
+            Log.Logger.Warn("Could not convert {ColorName} to RGBA, unexpected format", argb);
+            return argb;
         }
+
         var alpha = argb.Substring(1, 2);
         var rgb = argb[3..];
         return "#" + rgb + alpha;