Bug fix: The library does not load automatically on first login

Phalcode · Jan 8, 2024 · 20c621c · 20c621c
1 parent 194f8de
commit 20c621c
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 10 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -13,6 +13,7 @@ Recommended Gamevault Server Version: `v10.1.0`
 - You can now also open the user settings from the settings tab
 - The mouse wheel now scrolls horizontally in the installed game scrollbar when visible
 - A message is now displayed when an admin tries to change their role
+- Bug fix: The library does not load automatically on first login
 
 ## 1.8.1
 Recommended Gamevault Server Version: `v10.0.2`

diff --git a/gamevault/UserControls/LibraryUserControl.xaml b/gamevault/UserControls/LibraryUserControl.xaml
@@ -8,7 +8,7 @@
              xmlns:conv="clr-namespace:gamevault.Converter"
              xmlns:local="clr-namespace:gamevault.UserControls"
              mc:Ignorable="d" 
-             d:DesignHeight="450" d:DesignWidth="800" Loaded="Library_Loaded">
+             d:DesignHeight="450" d:DesignWidth="800">
     <UserControl.Resources>
         <conv:GameSizeConverter x:Key="sizeConv"/>
         <conv:LibraryPermissionRoleToVisibilityConverter x:Key="libCardsPermVisConv"/>

diff --git a/gamevault/UserControls/LibraryUserControl.xaml.cs b/gamevault/UserControls/LibraryUserControl.xaml.cs
@@ -32,21 +32,16 @@ public partial class LibraryUserControl : UserControl
         private LibraryViewModel ViewModel;
         private InputTimer inputTimer { get; set; }
 
-        private bool scrollBlocked = false;
-        private bool loaded = false;
+        private bool scrollBlocked = false;      
         public LibraryUserControl()
         {
             InitializeComponent();
             ViewModel = new LibraryViewModel();
             this.DataContext = ViewModel;
             InitTimer();
         }
-        private async void Library_Loaded(object sender, RoutedEventArgs e)
+        public async Task LoadLibrary()
         {
-            if (loaded)
-                return;
-
-            loaded = true;
             if (Preferences.Get(AppConfigKey.LibStartup, AppFilePath.UserFile) == "1")
             {
                 await Search();
@@ -275,7 +270,7 @@ private async void RandomGame_Click(object sender, MouseButtonEventArgs e)
                 {
                     string randomGame = WebHelper.GetRequest($"{SettingsViewModel.Instance.ServerUrl}/api/games/random");
                     return JsonSerializer.Deserialize<Game>(randomGame);
-                }                
+                }
                 catch (Exception ex)
                 {
                     MainWindowViewModel.Instance.AppBarText = WebExceptionHelper.TryGetServerMessage(ex);

diff --git a/gamevault/UserControls/SettingsComponents/LoginUserControl.xaml.cs b/gamevault/UserControls/SettingsComponents/LoginUserControl.xaml.cs
@@ -54,6 +54,7 @@ private async Task Login()
                     LoginState state = await LoginManager.Instance.ManualLogin(SettingsViewModel.Instance.UserName, uiPwBox.Password);
                     if (LoginState.Success == state)
                     {
+                        await MainWindowViewModel.Instance.Library.LoadLibrary();//Load library, because otherwise it would be empty for new users at the first login
                         MainWindowViewModel.Instance.AppBarText = $"Successfully logged in as '{SettingsViewModel.Instance.UserName}'";
                     }
                     else if (LoginState.Unauthorized == state)

diff --git a/gamevault/Windows/MainWindow.xaml.cs b/gamevault/Windows/MainWindow.xaml.cs
@@ -80,7 +80,7 @@ private async void MetroWindow_Loaded(object sender, System.Windows.RoutedEventA
             LoginState state = LoginManager.Instance.GetState();
             if (LoginState.Success == state)
             {
-
+                await MainWindowViewModel.Instance.Library.LoadLibrary();
             }
             else if (LoginState.Unauthorized == state || LoginState.Forbidden == state)
             {