diff --git a/CUE4Parse b/CUE4Parse
index 50d5e06d..08a5553d 160000
--- a/CUE4Parse
+++ b/CUE4Parse
@@ -1 +1 @@
-Subproject commit 50d5e06d421e2935cc4107df6352b36c341ec7c0
+Subproject commit 08a5553ddec50aa6064278b424620e95aabf4048
diff --git a/FModel/FModel.csproj b/FModel/FModel.csproj
index 3822bf06..0a192513 100644
--- a/FModel/FModel.csproj
+++ b/FModel/FModel.csproj
@@ -150,7 +150,7 @@
-
+
diff --git a/FModel/MainWindow.xaml.cs b/FModel/MainWindow.xaml.cs
index a79f953a..3c69be80 100644
--- a/FModel/MainWindow.xaml.cs
+++ b/FModel/MainWindow.xaml.cs
@@ -61,8 +61,8 @@ public partial class MainWindow
break;
}
- await _applicationView.InitOodle();
- await _applicationView.InitZlib();
+ await ApplicationViewModel.InitOodle();
+ await ApplicationViewModel.InitZlib();
await _applicationView.CUE4Parse.Initialize();
await _applicationView.AesManager.InitAes();
await _applicationView.UpdateProvider(true);
@@ -73,8 +73,8 @@ public partial class MainWindow
_applicationView.CUE4Parse.VerifyConsoleVariables(),
_applicationView.CUE4Parse.VerifyOnDemandArchives(),
_applicationView.CUE4Parse.InitMappings(),
- _applicationView.InitVgmStream(),
- _applicationView.InitImGuiSettings(newOrUpdated),
+ ApplicationViewModel.InitVgmStream(),
+ ApplicationViewModel.InitImGuiSettings(newOrUpdated),
Task.Run(() =>
{
if (UserSettings.Default.DiscordRpc == EDiscordRpc.Always)
diff --git a/FModel/ViewModels/ApplicationViewModel.cs b/FModel/ViewModels/ApplicationViewModel.cs
index 444885f7..86929360 100644
--- a/FModel/ViewModels/ApplicationViewModel.cs
+++ b/FModel/ViewModels/ApplicationViewModel.cs
@@ -162,7 +162,7 @@ public class ApplicationViewModel : ViewModel
RaisePropertyChanged(nameof(GameDisplayName));
}
- public async Task InitVgmStream()
+ public static async Task InitVgmStream()
{
var vgmZipFilePath = Path.Combine(UserSettings.Default.OutputDirectory, ".data", "vgmstream-win.zip");
if (File.Exists(vgmZipFilePath)) return;
@@ -188,7 +188,7 @@ public class ApplicationViewModel : ViewModel
}
}
- public async Task InitImGuiSettings(bool forceDownload)
+ public static async Task InitImGuiSettings(bool forceDownload)
{
var imgui = "imgui.ini";
var imguiPath = Path.Combine(UserSettings.Default.OutputDirectory, ".data", imgui);
@@ -203,7 +203,7 @@ public class ApplicationViewModel : ViewModel
}
}
- public async Task InitOodle()
+ public static async ValueTask InitOodle()
{
var oodlePath = Path.Combine(UserSettings.Default.OutputDirectory, ".data", OodleHelper.OODLE_DLL_NAME);
if (File.Exists(OodleHelper.OODLE_DLL_NAME))
@@ -218,14 +218,10 @@ public class ApplicationViewModel : ViewModel
OodleHelper.Initialize(oodlePath);
}
- public async Task InitZlib()
+ public static async ValueTask InitZlib()
{
var zlibPath = Path.Combine(UserSettings.Default.OutputDirectory, ".data", ZlibHelper.DLL_NAME);
- if (File.Exists(ZlibHelper.DLL_NAME))
- {
- File.Move(ZlibHelper.DLL_NAME, zlibPath, true);
- }
- else if (!File.Exists(zlibPath))
+ if (!File.Exists(zlibPath))
{
await ZlibHelper.DownloadDllAsync(zlibPath);
}