From 7dc62d298932e7b622de436e3f1aeb2d37055cf9 Mon Sep 17 00:00:00 2001 From: iAmAsval Date: Tue, 21 Dec 2021 11:36:12 +0100 Subject: [PATCH] fix --- CUE4Parse | 2 +- FModel/ViewModels/AesManagerViewModel.cs | 2 +- FModel/ViewModels/CustomDirectoriesViewModel.cs | 3 ++- FModel/ViewModels/SettingsViewModel.cs | 2 +- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/CUE4Parse b/CUE4Parse index ba385196..a1b6d306 160000 --- a/CUE4Parse +++ b/CUE4Parse @@ -1 +1 @@ -Subproject commit ba385196acee4cb1a716a3ee69b82165ce799dcd +Subproject commit a1b6d306fd1cfd9709fa3c86a6df11d499590173 diff --git a/FModel/ViewModels/AesManagerViewModel.cs b/FModel/ViewModels/AesManagerViewModel.cs index 2defdd9e..e962d0a0 100644 --- a/FModel/ViewModels/AesManagerViewModel.cs +++ b/FModel/ViewModels/AesManagerViewModel.cs @@ -110,7 +110,7 @@ namespace FModel.ViewModels _cue4Parse.ClearProvider(); await _cue4Parse.LoadVfs(AesKeys); - if (_cue4Parse.Game == FGame.Unknown) + if (_cue4Parse.Game == FGame.Unknown && UserSettings.Default.ManualGames.ContainsKey(UserSettings.Default.GameDirectory)) UserSettings.Default.ManualGames[UserSettings.Default.GameDirectory].AesKeys = _keysFromSettings; else UserSettings.Default.AesKeys[_cue4Parse.Game] = _keysFromSettings; diff --git a/FModel/ViewModels/CustomDirectoriesViewModel.cs b/FModel/ViewModels/CustomDirectoriesViewModel.cs index 851fd8e4..8e8c05f0 100644 --- a/FModel/ViewModels/CustomDirectoriesViewModel.cs +++ b/FModel/ViewModels/CustomDirectoriesViewModel.cs @@ -98,7 +98,8 @@ namespace FModel.ViewModels cd.Add(new CustomDirectory(m.Header.ToString(), m.Tag.ToString())); } - if (_game == FGame.Unknown) UserSettings.Default.ManualGames[_gameDirectoryAtLaunch].CustomDirectories = cd; + if (_game == FGame.Unknown && UserSettings.Default.ManualGames.ContainsKey(_gameDirectoryAtLaunch)) + UserSettings.Default.ManualGames[_gameDirectoryAtLaunch].CustomDirectories = cd; else UserSettings.Default.CustomDirectories[_game] = cd; } diff --git a/FModel/ViewModels/SettingsViewModel.cs b/FModel/ViewModels/SettingsViewModel.cs index 1ebe1ef5..8fe1a5d9 100644 --- a/FModel/ViewModels/SettingsViewModel.cs +++ b/FModel/ViewModels/SettingsViewModel.cs @@ -264,7 +264,7 @@ namespace FModel.ViewModels UserSettings.Default.UpdateMode = SelectedUpdateMode; UserSettings.Default.Presets[_game] = SelectedPreset; - if (_game == FGame.Unknown) + if (_game == FGame.Unknown && UserSettings.Default.ManualGames.ContainsKey(UserSettings.Default.GameDirectory)) { UserSettings.Default.ManualGames[UserSettings.Default.GameDirectory].OverridedGame = SelectedUeGame; UserSettings.Default.ManualGames[UserSettings.Default.GameDirectory].OverridedCustomVersions = SelectedCustomVersions;