Leahnaya/FModel
1
0
Fork 0
mirror of https://github.com/4sval/FModel.git synced 2026-03-21 17:24:26 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

InitOodle update, High on Life 2 and Borderlands 4 Audio support
Some checks failed
FModel QA Builder / build (push) Has been cancelled
Details

Browse Source
This commit is contained in:
LongerWarrior 2026-02-17 01:51:22 +02:00
parent 6b3a4ae785
commit 1c48a27f8e
3 changed files with 6 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CUE4Parse

@ -1 +1 @@
Subproject commit 1774159e9c85f4b42623cbd6e920b99c3b60b9f1
Subproject commit a451f8e3140c806da8b438e9b44dafe4c1c0a37b

24
FModel/ViewModels/ApplicationViewModel.cs
View File

@ -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()

2
FModel/Views/Resources/Controls/AvalonEditor.xaml.cs
View File

@ -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>();
}