FModel v4.4.3.5

4sval · Jan 7, 2024 · 0160abf · 0160abf
1 parent 3721d7c
commit 0160abf
Show file tree

Hide file tree

Showing 7 changed files with 6 additions and 13 deletions.
diff --git a/CUE4Parse b/CUE4Parse
diff --git a/FModel/Enums.cs b/FModel/Enums.cs
@@ -54,8 +54,6 @@ public enum EDiscordRpc
 
 public enum ELoadingMode
 {
-    [Description("Single")]
-    Single,
     [Description("Multiple")]
     Multiple,
     [Description("All")]

diff --git a/FModel/FModel.csproj b/FModel/FModel.csproj
@@ -5,9 +5,9 @@
     <TargetFramework>net8.0-windows</TargetFramework>
     <UseWPF>true</UseWPF>
     <ApplicationIcon>FModel.ico</ApplicationIcon>
-    <Version>4.4.3.4</Version>
-    <AssemblyVersion>4.4.3.4</AssemblyVersion>
-    <FileVersion>4.4.3.4</FileVersion>
+    <Version>4.4.3.5</Version>
+    <AssemblyVersion>4.4.3.5</AssemblyVersion>
+    <FileVersion>4.4.3.5</FileVersion>
     <IsPackable>false</IsPackable>
     <IsPublishable>true</IsPublishable>
     <RuntimeIdentifier>win-x64</RuntimeIdentifier>

diff --git a/FModel/ViewModels/CUE4ParseViewModel.cs b/FModel/ViewModels/CUE4ParseViewModel.cs
@@ -463,7 +463,7 @@ public Task VerifyOnDemandArchives()
                 ChunkBaseUri = new Uri("https://download.epicgames.com/ias/fortnite/", UriKind.Absolute),
                 ChunkCacheDirectory = Directory.CreateDirectory(Path.Combine(UserSettings.Default.OutputDirectory, ".data")),
                 Authorization = new AuthenticationHeaderValue("Bearer", UserSettings.Default.LastAuthResponse.AccessToken),
-                Timeout = TimeSpan.FromSeconds(15)
+                Timeout = TimeSpan.FromSeconds(30)
             });
             var onDemandCount = await Provider.MountAsync();
             FLogger.Append(ELog.Information, () =>

diff --git a/FModel/ViewModels/Commands/LoadCommand.cs b/FModel/ViewModels/Commands/LoadCommand.cs
@@ -61,7 +61,6 @@ await Task.WhenAll(
                 // filter what to show
                 switch (UserSettings.Default.LoadingMode)
                 {
-                    case ELoadingMode.Single:
                     case ELoadingMode.Multiple:
                     {
                         var l = (IList) parameter;

diff --git a/FModel/Views/Resources/Controls/AvalonEditor.xaml.cs b/FModel/Views/Resources/Controls/AvalonEditor.xaml.cs
@@ -223,10 +223,9 @@ private void OnCloseClick(object sender, RoutedEventArgs e)
 
     private void OnTabClose(object sender, EventArgs eventArgs)
     {
-        if (eventArgs is not TabControlViewModel.TabEventArgs e || e.TabToRemove.Document == null)
+        if (eventArgs is not TabControlViewModel.TabEventArgs e || e.TabToRemove.Document?.FileName is not { } fileName)
             return;
 
-        var fileName = e.TabToRemove.Document.FileName;
         if (_savedCarets.ContainsKey(fileName))
             _savedCarets.Remove(fileName);
     }

diff --git a/FModel/Views/Resources/Resources.xaml b/FModel/Views/Resources/Resources.xaml
@@ -183,9 +183,6 @@
                     </Setter.Value>
                 </Setter>
             </DataTrigger>
-            <DataTrigger Binding="{Binding LoadingMode, Source={x:Static settings:UserSettings.Default}}" Value="{x:Static local:ELoadingMode.Single}">
-                <Setter Property="SelectionMode" Value="Single" />
-            </DataTrigger>
             <DataTrigger Binding="{Binding LoadingMode, Source={x:Static settings:UserSettings.Default}}" Value="{x:Static local:ELoadingMode.Multiple}">
                 <Setter Property="SelectionMode" Value="Extended" />
             </DataTrigger>