Merge pull request #32 from KrystianLesniak/develop

Release: 1.4.5
KrystianLesniak · Oct 16, 2023 · d6dadb5 · d6dadb5
2 parents 36de16d + be8752c
commit d6dadb5
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 9 deletions.
diff --git a/src/GamesLauncher.Common/Settings/LastPlayedGames.cs b/src/GamesLauncher.Common/Settings/LastPlayedGames.cs
@@ -24,7 +24,7 @@ public int GetResultScoreByOrder(string internalGameId)
         {
             var index = OrderedGames.LastIndexOf(internalGameId);
 
-            return (++index) * 100;
+            return (++index) * 1000;
         }
 
     }

diff --git a/src/GamesLauncher.Platforms/GamesLauncher.Platforms.csproj b/src/GamesLauncher.Platforms/GamesLauncher.Platforms.csproj
@@ -20,7 +20,7 @@
     <PackageReference Include="GameFinder.StoreHandlers.Steam" Version="4.0.0" />
     <PackageReference Include="GameFinder.StoreHandlers.Xbox" Version="4.0.0" />
 	<PackageReference Include="Microsoft-WindowsAPICodePack-Shell" Version="1.1.5" />
-	<PackageReference Include="Microsoft.Data.Sqlite" Version="7.0.11" />
+	<PackageReference Include="Microsoft.Data.Sqlite" Version="7.0.12" />
 	<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
   </ItemGroup>
 
@@ -34,6 +34,9 @@
     <None Update="Icons\steam.png">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
+    <None Update="Icons\xbox.png">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
   </ItemGroup>
 
 </Project>
diff --git a/src/GamesLauncher.Platforms/Icons/xbox.png b/src/GamesLauncher.Platforms/Icons/xbox.png
diff --git a/src/GamesLauncher.Platforms/SyncEngines/XboxSyncEngine.cs b/src/GamesLauncher.Platforms/SyncEngines/XboxSyncEngine.cs
@@ -3,6 +3,7 @@
 using GameFinder.StoreHandlers.Xbox;
 using Microsoft.WindowsAPICodePack.Shell;
 using NexusMods.Paths;
+using static Flow.Launcher.Plugin.Result;
 
 namespace GamesLauncher.Platforms.SyncEngines
 {
@@ -37,23 +38,22 @@ public async IAsyncEnumerable<Game> GetGames()
                 {
                     var cmd = $"shell:appsFolder\\{shellGame.ParsingName}";
 
+                    var iconDelegate = GetIconDelegate(shellGame);
+
                     yield return new Game(
                         Title: shellGame.Name,
                         Platform: PlatformName,
                         RunTask: GetGameRunTask(cmd),
-                        IconPath: null,
-                        IconDelegate: delegate ()
-                        {
-                            return shellGame.Thumbnail.LargeBitmapSource;
-                        }
+                        IconPath: iconDelegate is null ? Path.Combine("Icons", "xbox.png") : null,
+                        IconDelegate: iconDelegate
                         );
                 }
             }
 
             await Task.CompletedTask;
         }
 
-        public Func<ActionContext, ValueTask<bool>> GetGameRunTask(string cmd)
+        private Func<ActionContext, ValueTask<bool>> GetGameRunTask(string cmd)
         {
             return (context) =>
             {
@@ -62,5 +62,20 @@ public Func<ActionContext, ValueTask<bool>> GetGameRunTask(string cmd)
                 return ValueTask.FromResult(true);
             };
         }
+
+        private static IconDelegate? GetIconDelegate(ShellObject shellGame)
+        {
+            var bitmapSource = shellGame.Thumbnail.LargeBitmapSource;
+
+            if (bitmapSource == null || bitmapSource.CanFreeze == false)
+                return null;
+
+            bitmapSource.Freeze();
+
+            return delegate ()
+            {
+                return bitmapSource;
+            };
+        }
     }
 }
diff --git a/src/GamesLauncher/plugin.json b/src/GamesLauncher/plugin.json
@@ -4,7 +4,7 @@
     "Name": "GamesLauncher",
     "Description": "Search and launch games from multiple platforms like Steam, Epic Games, Xbox etc.",
     "Author": "KrystianLesniak",
-    "Version": "1.4.4",
+    "Version": "1.4.5",
     "Language": "csharp",
     "Website": "https://github.com/KrystianLesniak/Flow.Launcher.Plugin.GamesLauncher",
     "IcoPath": "icon.png",