Issue Fix: Favorites page when set as startup page opened as home page

spacefarergames · Dec 5, 2023 · 500d547 · 500d547
1 parent 513b6c1
commit 500d547
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/Gavilya/ViewModels/FavPageViewModel.cs b/Gavilya/ViewModels/FavPageViewModel.cs
@@ -67,7 +67,9 @@ public bool IsCardSelected
 
     public FavPageViewModel(GameList games, List<Tag> tags, MainViewModel mainViewModel)
     {
-        Games = games;
+
+        Games = new GameList(games.Where(game => game.IsFavorite));
+
         _tags = tags;
         _mainViewModel = mainViewModel;
 

diff --git a/Gavilya/ViewModels/MainViewModel.cs b/Gavilya/ViewModels/MainViewModel.cs
@@ -126,9 +126,10 @@ public MainViewModel(Window window, Profile profile, ProfileData profiles, Page?
 		Games = profile.Games;
 		CurrentSettings = profile.Settings;
 
-		CurrentViewModel = (startupPage is null ? profile.Settings.DefaultPage : startupPage) switch
+        CurrentViewModel = (startupPage is null ? profile.Settings.DefaultPage : startupPage) switch
 		{
 			Page.Library => new LibPageViewModel(Games, profile.Tags, this),
+			Page.Favorites => new FavPageViewModel(Games, profile.Tags, this),
 			Page.Recent => new RecentPageViewModel(Games, profile.Tags, this),
 			Page.Profile => new ProfileViewModel(profile, profiles, Games, this),
 			_ => new HomePageViewModel(Games, profile.Tags, this)

diff --git a/Gavilya/ViewModels/NavBarViewModel.cs b/Gavilya/ViewModels/NavBarViewModel.cs
@@ -120,9 +120,7 @@ private void LibraryPage(object? obj)
 
     private void FavoritesPage(object? obj)
     {
-        GameList favoriteGames = new GameList(Games.Where(game => game.IsFavorite));
-
-        _mainViewModel.CurrentViewModel = new FavPageViewModel(favoriteGames, _tags, _mainViewModel);
+        _mainViewModel.CurrentViewModel = new FavPageViewModel(Games, _tags, _mainViewModel);
     }