From 1c48a27f8ebb3771ed12d240d8f14edef6871754 Mon Sep 17 00:00:00 2001
From: LongerWarrior <LongerWarrior@gmail.com>
Date: Tue, 17 Feb 2026 01:51:22 +0200
Subject: [PATCH] InitOodle update,  High on Life 2 and Borderlands 4 Audio
 support

---
 CUE4Parse                                     |  2 +-
 FModel/ViewModels/ApplicationViewModel.cs     | 24 ++++---------------
 .../Resources/Controls/AvalonEditor.xaml.cs   |  2 +-
 3 files changed, 6 insertions(+), 22 deletions(-)

diff --git a/CUE4Parse b/CUE4Parse
index 1774159e..a451f8e3 160000
--- a/CUE4Parse
+++ b/CUE4Parse
@@ -1 +1 @@
-Subproject commit 1774159e9c85f4b42623cbd6e920b99c3b60b9f1
+Subproject commit a451f8e3140c806da8b438e9b44dafe4c1c0a37b
diff --git a/FModel/ViewModels/ApplicationViewModel.cs b/FModel/ViewModels/ApplicationViewModel.cs
index 0c8839b2..7822aa70 100644
--- a/FModel/ViewModels/ApplicationViewModel.cs
+++ b/FModel/ViewModels/ApplicationViewModel.cs
@@ -268,31 +268,15 @@ public class ApplicationViewModel : ViewModel
 
     public static async Task InitOodle()
     {
-        if (File.Exists(OodleHelper.OODLE_DLL_NAME_OLD))
-        {
-            try
-            {
-                File.Delete(OodleHelper.OODLE_DLL_NAME_OLD);
-            }
-            catch { /* ignored */}
-        }
-
-        var oodlePath = Path.Combine(UserSettings.Default.OutputDirectory, ".data", OodleHelper.OODLE_DLL_NAME_OLD);
+        var oodlePath = Path.Combine(UserSettings.Default.OutputDirectory, ".data", OodleHelper.OODLE_NAME_OLD);
         if (!File.Exists(oodlePath))
         {
-            oodlePath = Path.Combine(UserSettings.Default.OutputDirectory, ".data", OodleHelper.OODLE_DLL_NAME);
-        }
-
-        if (!File.Exists(oodlePath))
-        {
-            if (!await OodleHelper.DownloadOodleDllAsync(oodlePath))
-            {
-                FLogger.Append(ELog.Error, () => FLogger.Text("Failed to download Oodle", Constants.WHITE, true));
-                return;
-            }
+            oodlePath = Path.Combine(UserSettings.Default.OutputDirectory, ".data", OodleHelper.OODLE_NAME_CURRENT);
         }
 
         OodleHelper.Initialize(oodlePath);
+        if (OodleHelper.Instance is null)
+            FLogger.Append(ELog.Error, () => FLogger.Text("Failed to download Oodle", Constants.WHITE, true));
     }
 
     public static async Task InitZlib()
diff --git a/FModel/Views/Resources/Controls/AvalonEditor.xaml.cs b/FModel/Views/Resources/Controls/AvalonEditor.xaml.cs
index db81c600..9aebc30c 100644
--- a/FModel/Views/Resources/Controls/AvalonEditor.xaml.cs
+++ b/FModel/Views/Resources/Controls/AvalonEditor.xaml.cs
@@ -27,7 +27,7 @@ public partial class AvalonEditor
     private readonly Dictionary<string, NavigationList<int>> _savedCarets = new();
     private NavigationList<int> _caretsOffsets
     {
-        get => MyAvalonEditor.Document != null
+        get => MyAvalonEditor.Document != null && MyAvalonEditor.Document.FileName != null
             ? _savedCarets.GetOrAdd(MyAvalonEditor.Document.FileName, () => new NavigationList<int>())
             : new NavigationList<int>();
     }