- Bug fix: Fixed an issue where the current user's profile data was overwritten when modifying another user's data.

- Bug fix: Fixed an empty message issue when the uninstall selection was cancelled.

- Bug fix: Resolved folder mapping issues on download cards when a root directory was a subdirectory of another root.

- Improvement: Downloads are now correctly restored when root directories are added or removed.

Author: Yelo420

gamevault/UserControls/DownloadsUserControl.xaml.cs

@@ -53,7 +53,11 @@ public async Task RestoreDownloadedGames()
                          string gameId = dirName.Substring(2, dirName.IndexOf(')') - 2);
 
                          if (int.TryParse(gameId, out int id))
-                             foundPathsById.Add(id, SettingsViewModel.Instance.RootDirectories.First(x => dir.Contains(x.Uri)).Uri);
+                             foundPathsById.Add(id, SettingsViewModel.Instance.RootDirectories
+                            .Where(x => dir.Contains(x.Uri))
+                            .OrderByDescending(x => x.Uri.Length)
+                            .First().Uri);
+
                      }
                      catch { continue; }
                  }
@@ -107,9 +111,32 @@ public async Task RestoreDownloadedGames()
             if (games == null)
                 return;
 
-            foreach (KeyValuePair<Game, string> game in games)
+            var validGameIds = new HashSet<int>(games.Keys.Select(g => g.ID));
+            // Remove controls not in the dictionary, unless they're downloading
+            for (int i = DownloadsViewModel.Instance.DownloadedGames.Count - 1; i >= 0; i--)
             {
-                DownloadsViewModel.Instance.DownloadedGames.Add(new GameDownloadUserControl(game.Key, game.Value, false));
+                var control = DownloadsViewModel.Instance.DownloadedGames[i];
+                int gameId = control.GetGameId();
+
+                bool existsInDict = validGameIds.Contains(gameId);
+                
+                if (control.IsDownloading())
+                {
+                    control.PauseDownload();
+                }
+                if (!existsInDict)
+                {
+                    DownloadsViewModel.Instance.DownloadedGames.RemoveAt(i);
+                }
+            }
+            var existingIds = new HashSet<int>(DownloadsViewModel.Instance.DownloadedGames.Select(c => c.GetGameId()));
+
+            foreach (var game in games)
+            {
+                if (!existingIds.Contains(game.Key.ID))
+                {
+                    DownloadsViewModel.Instance.DownloadedGames.Add(new GameDownloadUserControl(game.Key, game.Value, false));
+                }
             }
         }
         public void RefreshGame(Game game)

gamevault/UserControls/GameDownloadUserControl.xaml.cs

@@ -260,6 +260,16 @@ private void PauseResume_Click(object sender, RoutedEventArgs e)
                 ViewModel.State = "Download Paused";
             }
         }
+        public void PauseDownload()
+        {
+            if (client == null || ViewModel.IsDownloadPaused || !IsDownloadActive)
+                return;
+
+            ViewModel.IsDownloadPaused = true;
+            client.Pause();
+            IsDownloadActive = false;
+            ViewModel.State = "Download Paused";
+        }
         private void DownloadProgress(long totalFileSize, long currentBytesDownloaded, long totalBytesDownloaded, double? progressPercentage, long resumePosition)
         {
             App.Current.Dispatcher.Invoke((Action)delegate

gamevault/UserControls/GameSettingsUserControl.xaml.cs

@@ -245,6 +245,11 @@ public async Task UninstallGame()
                             }
                         }
                     }
+                    if (!File.Exists(selectedUninstallerExecutablePath))
+                    {
+                        MainWindowViewModel.Instance.AppBarText = "No valid uninstall executable selected";
+                        return;
+                    }
                     Process uninstProcess = null;
                     try
                     {

gamevault/UserControls/SettingsUserControl.xaml.cs

@@ -640,6 +640,7 @@ private async void AddRootDirectory_Click(object sender, RoutedEventArgs e)
                     string result = string.Join(";", ViewModel.RootDirectories.Select(entry => entry.Uri));
                     Preferences.Set(AppConfigKey.RootDirectories, result, LoginManager.Instance.GetUserProfile().UserConfigFile);
                     await MainWindowViewModel.Instance.Library.GetGameInstalls().RestoreInstalledGames();
+                    await MainWindowViewModel.Instance.Downloads.RestoreDownloadedGames();
                 }
             }
             catch (Exception ex)
@@ -661,6 +662,7 @@ private async void RemoveRootDirectory_Click(object sender, RoutedEventArgs e)
 
                     ((FrameworkElement)sender).IsEnabled = false;//Disable the add button to block async restoring installed games
                     await MainWindowViewModel.Instance.Library.GetGameInstalls().RestoreInstalledGames();
+                    await MainWindowViewModel.Instance.Downloads.RestoreDownloadedGames();
                 }
             }
             catch (Exception ex)

gamevault/UserControls/UserSettingsUserControl.xaml.cs

@@ -371,7 +371,10 @@ private async void SaveUserDetails_Click(object sender, RoutedEventArgs e)
                 }
                 string result = await WebHelper.PutAsync(url, JsonSerializer.Serialize(selectedUser));
                 ViewModel.OriginUser = JsonSerializer.Deserialize<User>(result);
-                WebHelper.OverrideCredentials(selectedUser.Username, selectedUser.Password);
+                if (LoginManager.Instance.GetCurrentUser().ID == ViewModel.OriginUser.ID)
+                {
+                    WebHelper.OverrideCredentials(selectedUser.Username, selectedUser.Password);
+                }
                 MainWindowViewModel.Instance.AppBarText = "Successfully saved user changes";
             }
             catch (Exception ex)

gamevault/ViewModels/SettingsViewModel.cs

@@ -449,7 +449,7 @@ public string Version
         {
             get
             {
-                return Assembly.GetExecutingAssembly().GetName().Version.ToString() + "EA1";
+                return Assembly.GetExecutingAssembly().GetName().Version.ToString() + "EA2";
             }
         }
         //DevMode

gamevault/Windows/LoginWindow.xaml

@@ -65,7 +65,10 @@
                                                                     <StackPanel Background="Transparent">
                                                                         <Border Background="{DynamicResource MahApps.Brushes.ThemeBackground}" CornerRadius="5">
                                                                             <Grid Height="100" Width="100">
-                                                                                <uc:CacheImage UseUriSource="True" ImageCacheType="UserAvatar" Data="{Binding UserCacheAvatar}" CornerRadius="5"/>
+                                                                                <Grid>
+                                                                                    <uc:CacheImage UseUriSource="True" ImageCacheType="UserAvatar" Data="{Binding UserCacheAvatar}" CornerRadius="5"/>
+                                                                                    <Border x:Name="HoverBlur" Visibility="Hidden" Background="{DynamicResource GameVault.Brushes.Blur}" CornerRadius="5"/>
+                                                                                </Grid>
                                                                                 <Button x:Name="DeleteUserProfile" Style="{StaticResource ButtonWrapper}" Visibility="Hidden" Margin="0,0,0,3" Click="UserProfileContextMenu_Click">
                                                                                     <Border Style="{StaticResource HoverEffect}" Background="Transparent" HorizontalAlignment="Right" VerticalAlignment="Bottom" CornerRadius="5">
                                                                                         <Path Data="{StaticResource IconInstalledGamesSettings}" Fill="White" Margin="0,0,5,2"/>
@@ -96,6 +99,7 @@
                                                                     <Trigger Property="IsMouseOver" Value="True">
                                                                         <Setter TargetName="DeleteUserProfile" Property="Visibility" Value="Visible"/>
                                                                         <Setter TargetName="ProfileInfo" Property="Visibility" Value="Visible"/>
+                                                                        <Setter TargetName="HoverBlur" Property="Visibility" Value="Visible"/>
                                                                     </Trigger>
                                                                 </ControlTemplate.Triggers>
                                                             </ControlTemplate>