diff --git a/FModel/Framework/FRestRequest.cs b/FModel/Framework/FRestRequest.cs index b09cf30c..7d786dbc 100644 --- a/FModel/Framework/FRestRequest.cs +++ b/FModel/Framework/FRestRequest.cs @@ -1,11 +1,12 @@ using System; +using FModel.Settings; using RestSharp; namespace FModel.Framework; public class FRestRequest : RestRequest { - private const int TimeoutSeconds = 5; + private int TimeoutSeconds = UserSettings.Default.HttpRequestTimeout; public FRestRequest(string url, Method method = Method.Get) : base(url, method) { diff --git a/FModel/Settings/UserSettings.cs b/FModel/Settings/UserSettings.cs index bca1427d..7c67942a 100644 --- a/FModel/Settings/UserSettings.cs +++ b/FModel/Settings/UserSettings.cs @@ -544,5 +544,12 @@ public bool PreviewTexturesAssetExplorer get => _previewTexturesAssetExplorer; set => SetProperty(ref _previewTexturesAssetExplorer, value); } + + private int _httpRequestTimeout = 60; + public int HttpRequestTimeout + { + get => _httpRequestTimeout; + set => SetProperty(ref _httpRequestTimeout, value); + } } } diff --git a/FModel/ViewModels/CUE4ParseViewModel.cs b/FModel/ViewModels/CUE4ParseViewModel.cs index 26af56c6..4a715692 100644 --- a/FModel/ViewModels/CUE4ParseViewModel.cs +++ b/FModel/ViewModels/CUE4ParseViewModel.cs @@ -231,7 +231,7 @@ await _threadWorkerView.Begin(cancellationToken => { ChunkHostUri = new Uri("https://download.epicgames.com/", UriKind.Absolute), ChunkCacheDirectory = Directory.CreateDirectory(Path.Combine(UserSettings.Default.OutputDirectory, ".data")), - Timeout = TimeSpan.FromSeconds(30) + Timeout = TimeSpan.FromSeconds(UserSettings.Default.HttpRequestTimeout) }; switch (Provider) diff --git a/FModel/ViewModels/SettingsViewModel.cs b/FModel/ViewModels/SettingsViewModel.cs index 626f4227..0ca1c3ea 100644 --- a/FModel/ViewModels/SettingsViewModel.cs +++ b/FModel/ViewModels/SettingsViewModel.cs @@ -314,7 +314,7 @@ public bool Save(out List whatShouldIDo) UserSettings.Default.CurrentDir.Versioning.Options = SelectedOptions; UserSettings.Default.CurrentDir.Versioning.MapStructTypes = SelectedMapStructTypes; UserSettings.Default.CurrentDir.CriwareDecryptionKey = CriwareDecryptionKey; - + UserSettings.Default.AssetLanguage = SelectedAssetLanguage; UserSettings.Default.CompressedAudioMode = SelectedCompressedAudio; UserSettings.Default.CosmeticStyle = SelectedCosmeticStyle; diff --git a/FModel/Views/SettingsView.xaml b/FModel/Views/SettingsView.xaml index b38b62d5..e9591468 100644 --- a/FModel/Views/SettingsView.xaml +++ b/FModel/Views/SettingsView.xaml @@ -267,7 +267,6 @@ TextAlignment="Right" TextChanged="CriwareKeyBox_TextChanged" Loaded="CriwareKeyBox_Loaded"/> - diff --git a/FModel/Views/SettingsView.xaml.cs b/FModel/Views/SettingsView.xaml.cs index ba73d7f8..b600177d 100644 --- a/FModel/Views/SettingsView.xaml.cs +++ b/FModel/Views/SettingsView.xaml.cs @@ -6,6 +6,7 @@ using System.Windows; using System.Windows.Controls; using System.Windows.Documents; +using System.Windows.Input; using FModel.Services; using FModel.Settings; using FModel.ViewModels;