SteamScreenshots: Check context after downloading screenshots

darklinkpower · May 28, 2024 · 61d973d · 61d973d
1 parent b05fe35
commit 61d973d
Showing 1 changed file with 8 additions and 3 deletions.
diff --git a/source/Generic/SteamScreenshots/ScreenshotsControl/SteamScreenshotsControl.xaml.cs b/source/Generic/SteamScreenshots/ScreenshotsControl/SteamScreenshotsControl.xaml.cs
@@ -190,6 +190,7 @@ public override void GameContextChanged(Game oldContext, Game newContext)
         private void ResetToDefaultValues()
         {
             SetCollapsedVisibility();
+            _activeContext = default;
             _isValuesDefaultState = true;
         }
 
@@ -217,7 +218,7 @@ private async Task LoadControlData(Game game, CancellationToken cancellationToke
             var gameDataPath = Path.Combine(_pluginStoragePath, "appdetails", $"{steamId}_appdetails.json");
             if (FileSystem.FileExists(gameDataPath))
             {
-                await SetScreenshots(gameDataPath, false);
+                await SetScreenshots(gameDataPath, false, scopeContext);
                 return;
             }
 
@@ -231,10 +232,10 @@ private async Task LoadControlData(Game game, CancellationToken cancellationToke
                 return;
             }
 
-            await SetScreenshots(gameDataPath, true);
+            await SetScreenshots(gameDataPath, true, scopeContext);
         }
 
-        private async Task SetScreenshots(string gameDataPath, bool downloadScreenshots)
+        private async Task SetScreenshots(string gameDataPath, bool downloadScreenshots, Guid scopeContext)
         {
             try
             {
@@ -258,6 +259,10 @@ private async Task SetScreenshots(string gameDataPath, bool downloadScreenshots)
                 if (downloadScreenshots)
                 {
                     await DownloadScreenshotsThumbnails(response.data.screenshots);
+                    if (_activeContext != scopeContext)
+                    {
+                        return;
+                    }
                 }
 
                 foreach (var screenshot in response.data.screenshots)