- Bug fix: Media slider video was sometimes rendered on top of a popup

- Bug fix: Crash on Media Slider navigation - Bug fix: Crash on create shortcut after installation
Phalcode · Nov 8, 2024 · b0889a2 · b0889a2
1 parent eb29f66
commit b0889a2
Show file tree

Hide file tree

Showing 7 changed files with 20 additions and 10 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,13 @@
 # GameVault App Changelog
 
+## 1.13.2
+Recommended Gamevault Server Version: `v13.1.0`
+### Changes
+
+- Bug fix: Media slider video was sometimes rendered on top of a popup
+- Bug fix: Crash on Media Slider navigation
+- Bug fix: Crash on create shortcut after installation
+
 ## 1.13.1
 Recommended Gamevault Server Version: `v13.1.0`
 ### Changes

diff --git a/gamevault/AssemblyInfo.cs b/gamevault/AssemblyInfo.cs
@@ -11,7 +11,7 @@
                                               //(used if a resource is not found in the page,
                                               // app, or any theme specific resource dictionaries)
 )]
-[assembly: AssemblyVersion("1.13.1.0")]
+[assembly: AssemblyVersion("1.13.2.0")]
 [assembly: AssemblyCopyright("© Phalcode™. All Rights Reserved.")]
 #if DEBUG
 [assembly: XmlnsDefinition("debug-mode", "Namespace")]

diff --git a/gamevault/UserControls/GameDownloadUserControl.xaml.cs b/gamevault/UserControls/GameDownloadUserControl.xaml.cs
@@ -725,7 +725,7 @@ await Task.Run(() =>
             {
                 await Task.Delay(1000);
                 var game = InstallViewModel.Instance.InstalledGames.Where(g => g.Key.ID == ViewModel.Game.ID).FirstOrDefault();
-                if (game.Key == null)
+                if (game.Key == null || !Directory.Exists(game.Value))
                     return;
 
                 if (!File.Exists(Preferences.Get(AppConfigKey.Executable, $"{game.Value}\\gamevault-exec")))

diff --git a/gamevault/UserControls/GameViewUserControl.xaml.cs b/gamevault/UserControls/GameViewUserControl.xaml.cs
@@ -237,7 +237,6 @@ private void GameSettings_Click(object sender, RoutedEventArgs e)
             if (ViewModel.Game == null)
                 return;
 
-            uiMediaSlider.UnloadMediaSlider();
             MainWindowViewModel.Instance.OpenPopup(new GameSettingsUserControl(ViewModel.Game) { Width = 1200, Height = 800, Margin = new Thickness(50) });
         }
         private async void GameDownload_Click(object sender, RoutedEventArgs e)

diff --git a/gamevault/UserControls/GeneralControls/MediaSlider.xaml.cs b/gamevault/UserControls/GeneralControls/MediaSlider.xaml.cs
@@ -219,8 +219,11 @@ private async Task MediaSliderNavigate(string url)
             {
                 uiWebView.Visibility = Visibility.Visible;
             }
-            uiWebView.CoreWebView2.Navigate(url);
-
+            try
+            {
+                uiWebView.CoreWebView2.Navigate(url);
+            }
+            catch { }
         }
         private void ToggleFullscreen()
         {

diff --git a/gamevault/ViewModels/MainWindowViewModel.cs b/gamevault/ViewModels/MainWindowViewModel.cs
@@ -144,6 +144,10 @@ public FrameworkElement Popup
         }
         public void OpenPopup(FrameworkElement userControl)
         {
+            if (MainWindowViewModel.Instance.ActiveControl?.GetType() == typeof(GameViewUserControl))//Else the popup would be rendered below the media slider because of the airspace problem
+            {
+                ((GameViewUserControl)MainWindowViewModel.Instance.ActiveControl).uiMediaSlider.UnloadMediaSlider();
+            }
             Popup = userControl;
         }
         public void ClosePopup()

diff --git a/gamevault/Windows/MainWindow.xaml.cs b/gamevault/Windows/MainWindow.xaml.cs
@@ -212,11 +212,7 @@ private void InitNewsTimer()
         }
 
         private void News_Click(object sender, System.Windows.Input.MouseButtonEventArgs e)
-        {
-            if (MainWindowViewModel.Instance.ActiveControl.GetType() == typeof(GameViewUserControl))//Else the news popup would be rendered below the media slider because of the airspace problem
-            {
-                ((GameViewUserControl)MainWindowViewModel.Instance.ActiveControl).uiMediaSlider.UnloadMediaSlider();
-            }
+        {          
             MainWindowViewModel.Instance.OpenPopup(new NewsPopup());
             try
             {