Fix uninstalling games

hawkeye116477 · Nov 20, 2024 · 1117efb · 1117efb
1 parent 521e653
commit 1117efb
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 9 deletions.
diff --git a/src/NileGameController.cs b/src/NileGameController.cs
@@ -156,13 +156,6 @@ public static void LaunchUninstaller(List<Game> games)
                                     File.Delete(gameSettingsFile);
                                 }
                             }
-                            var downloadManager = NileLibrary.GetNileDownloadManager();
-                            var wantedItem = downloadManager.downloadManagerData.downloads.FirstOrDefault(item => item.gameID == game.GameId);
-                            if (wantedItem != null)
-                            {
-                                downloadManager.downloadManagerData.downloads.Remove(wantedItem);
-                                downloadManager.downloadsChanged = true;
-                            }
                             game.IsInstalled = false;
                             game.InstallDirectory = "";
                             game.Version = "";

diff --git a/src/NileGameInstallerView.xaml.cs b/src/NileGameInstallerView.xaml.cs
@@ -226,6 +226,7 @@ private async void NileGameInstallerUC_Loaded(object sender, RoutedEventArgs e)
 
             bool gamesListShouldBeDisplayed = false;
 
+            var installedAppList = Nile.GetInstalledAppList();
 
             foreach (var installData in MultiInstallData.ToList())
             {
@@ -240,8 +241,15 @@ private async void NileGameInstallerUC_Loaded(object sender, RoutedEventArgs e)
                 var wantedItem = downloadManager.downloadManagerData.downloads.FirstOrDefault(item => item.gameID == installData.gameID);
                 if (wantedItem != null)
                 {
-                    downloadItemsAlreadyAdded.Add(installData.name);
-                    MultiInstallData.Remove(installData);
+                    if (wantedItem.status == DownloadStatus.Completed && installedAppList.FirstOrDefault(i => i.id == installData.gameID) == null)
+                    {
+                        downloadManager.downloadManagerData.downloads.Remove(wantedItem);
+                    }
+                    else
+                    {
+                        downloadItemsAlreadyAdded.Add(installData.name);
+                        MultiInstallData.Remove(installData);
+                    }
                 }
             }