Fix NRE on Check Update when no new version is available

#599
CollapseLauncher · Nov 3, 2024 · b4b8832 · b4b8832
1 parent e2ca70f
commit b4b8832
Showing 1 changed file with 14 additions and 14 deletions.
diff --git a/CollapseLauncher/XAMLs/MainApp/Pages/SettingsPage.xaml.cs b/CollapseLauncher/XAMLs/MainApp/Pages/SettingsPage.xaml.cs
@@ -10,7 +10,6 @@
     using CollapseLauncher.Helper.Image;
     using CollapseLauncher.Helper.Metadata;
     using CollapseLauncher.Helper.Update;
-    using CollapseLauncher.Interfaces;
     using CollapseLauncher.Pages.OOBE;
     using CollapseLauncher.Statics;
     using CommunityToolkit.WinUI;
@@ -305,14 +304,15 @@ private async void CheckUpdate(object sender, RoutedEventArgs e)
 
                 LauncherUpdateInvoker.UpdateEvent += LauncherUpdateInvoker_UpdateEvent;
                 bool isUpdateAvailable = await LauncherUpdateHelper.IsUpdateAvailable(true);
-                if (LauncherUpdateHelper.AppUpdateVersionProp.Version != null)
+                LauncherUpdateWatcher.GetStatus(new LauncherUpdateProperty
                 {
-                    LauncherUpdateWatcher.GetStatus(new LauncherUpdateProperty
-                    {
-                        IsUpdateAvailable = isUpdateAvailable,
-                        NewVersionName    = LauncherUpdateHelper.AppUpdateVersionProp.Version.Value
-                    });
-                }
+                    IsUpdateAvailable = isUpdateAvailable, 
+                    // ReSharper disable PossibleInvalidOperationException
+                    NewVersionName = (GameVersion)(isUpdateAvailable
+                        ? LauncherUpdateHelper.AppUpdateVersionProp.Version.Value
+                        : LauncherUpdateHelper.LauncherCurrentVersion)
+                    // ReSharper restore PossibleInvalidOperationException
+                });
             }
             catch (Exception ex)
             {
@@ -425,14 +425,14 @@ private async void SelectBackgroundImg(object sender, RoutedEventArgs e)
                 BGPathDisplay.Text = file;
 
                 GamePresetProperty currentGameProperty = GamePropertyVault.GetCurrentGameProperty();
-                bool isUseRegionCustomBG = ((IGameSettingsUniversal)currentGameProperty?._GameSettings)?.SettingsCollapseMisc?.UseCustomRegionBG ?? false;
+                bool isUseRegionCustomBG = currentGameProperty?._GameSettings?.SettingsCollapseMisc?.UseCustomRegionBG ?? false;
                 if (!isUseRegionCustomBG)
                 {
                     BackgroundImgChanger.ChangeBackground(LauncherMetadataHelper.CurrentMetadataConfig.GameLauncherApi.GameBackgroundImgLocal, null, true, true, true);
                 }
-                else if (!string.IsNullOrEmpty(((IGameSettingsUniversal)currentGameProperty._GameSettings)?.SettingsCollapseMisc?.CustomRegionBGPath))
+                else if (!string.IsNullOrEmpty(currentGameProperty._GameSettings?.SettingsCollapseMisc?.CustomRegionBGPath))
                 {
-                    currentMediaType = BackgroundMediaUtility.GetMediaType(((IGameSettingsUniversal)currentGameProperty._GameSettings)?.SettingsCollapseMisc?.CustomRegionBGPath);
+                    _ = BackgroundMediaUtility.GetMediaType(currentGameProperty._GameSettings?.SettingsCollapseMisc?.CustomRegionBGPath);
                 }
             }
         }
@@ -457,7 +457,7 @@ private bool IsBGCustom
             {
                 bool isEnabled = GetAppConfigValue("UseCustomBG").ToBool();
                 string BGPath = GetAppConfigValue("CustomBGPath").ToString();
-                LogWriteLine("Read " + isEnabled + " BG Path: " + BGPath + " from config", LogType.Debug, false);
+                LogWriteLine("Read " + isEnabled + " BG Path: " + BGPath + " from config", LogType.Scheme, true);
                 if (!string.IsNullOrEmpty(BGPath))
                     BGPathDisplay.Text = BGPath;
                 else
@@ -481,7 +481,7 @@ private bool IsBGCustom
             {
                 SetAndSaveConfigValue("UseCustomBG", value);
                 GamePresetProperty currentGameProperty = GamePropertyVault.GetCurrentGameProperty();
-                bool isUseRegionCustomBG = ((IGameSettingsUniversal)currentGameProperty?._GameSettings)?.SettingsCollapseMisc?.UseCustomRegionBG ?? false;
+                bool isUseRegionCustomBG = currentGameProperty?._GameSettings?.SettingsCollapseMisc?.UseCustomRegionBG ?? false;
                 if (!value)
                 {
                     LauncherMetadataHelper.CurrentMetadataConfig.GameLauncherApi.GameBackgroundImgLocal = GetAppConfigValue("CurrentBackground").ToString();
@@ -491,7 +491,7 @@ private bool IsBGCustom
                 }
                 else if (isUseRegionCustomBG)
                 {
-                    string currentRegionCustomBg = ((IGameSettingsUniversal)currentGameProperty._GameSettings).SettingsCollapseMisc.CustomRegionBGPath;
+                    string currentRegionCustomBg = currentGameProperty._GameSettings.SettingsCollapseMisc.CustomRegionBGPath;
                     LauncherMetadataHelper.CurrentMetadataConfig.GameLauncherApi.GameBackgroundImgLocal = currentRegionCustomBg;
                     m_mainPage?.ChangeBackgroundImageAsRegionAsync();