From 92202297dbfbeb5f8c05168d421c4afa0c5f2b1c Mon Sep 17 00:00:00 2001 From: Asval Date: Mon, 10 Aug 2026 21:17:54 +0200 Subject: [PATCH] iykujthgrr --- CUE4Parse | 2 +- FModel/ViewModels/TabControlViewModel.cs | 2 +- FModel/Views/ExportSessionWindow.xaml | 2 +- FModel/Views/ExportSessionWindow.xaml.cs | 3 +++ .../Resources/Controls/{HotkeyControls.cs => HotkeyTextBox.cs} | 0 FModel/Views/Snooper/Options.cs | 2 +- 6 files changed, 7 insertions(+), 4 deletions(-) rename FModel/Views/Resources/Controls/{HotkeyControls.cs => HotkeyTextBox.cs} (100%) diff --git a/CUE4Parse b/CUE4Parse index b046ebb4..f960ed67 160000 --- a/CUE4Parse +++ b/CUE4Parse @@ -1 +1 @@ -Subproject commit b046ebb4307565e9cccd44aeac3afc828d3ab327 +Subproject commit f960ed67f0f63b05225ceb0e5577a067fe37e06d diff --git a/FModel/ViewModels/TabControlViewModel.cs b/FModel/ViewModels/TabControlViewModel.cs index e7728347..a2b7ddf7 100644 --- a/FModel/ViewModels/TabControlViewModel.cs +++ b/FModel/ViewModels/TabControlViewModel.cs @@ -294,7 +294,7 @@ public class TabItem : ViewModel var img = new CTexture[1]; if (texture is UTexture2DArray textureArray) { - img = textureArray.DecodeTextureArray(null, UserSettings.Default.CurrentDir.TexturePlatform); + img = textureArray.DecodeTextureArray(UserSettings.Default.CurrentDir.TexturePlatform); appendLayerNumber = true; } else diff --git a/FModel/Views/ExportSessionWindow.xaml b/FModel/Views/ExportSessionWindow.xaml index ae46c8f2..61a6f26b 100644 --- a/FModel/Views/ExportSessionWindow.xaml +++ b/FModel/Views/ExportSessionWindow.xaml @@ -386,7 +386,7 @@ - diff --git a/FModel/Views/ExportSessionWindow.xaml.cs b/FModel/Views/ExportSessionWindow.xaml.cs index 46ae6a50..4ea4941f 100644 --- a/FModel/Views/ExportSessionWindow.xaml.cs +++ b/FModel/Views/ExportSessionWindow.xaml.cs @@ -16,7 +16,10 @@ public partial class ExportSessionWindow private async void OnExportClick(object sender, RoutedEventArgs e) { if (sender is Button { DataContext: ExportSessionViewModel { CanExport: true } viewModel }) + { + Tabs.SelectedIndex = 0; await viewModel.ExportAsync(); + } } private void OnOkClick(object sender, RoutedEventArgs e) diff --git a/FModel/Views/Resources/Controls/HotkeyControls.cs b/FModel/Views/Resources/Controls/HotkeyTextBox.cs similarity index 100% rename from FModel/Views/Resources/Controls/HotkeyControls.cs rename to FModel/Views/Resources/Controls/HotkeyTextBox.cs diff --git a/FModel/Views/Snooper/Options.cs b/FModel/Views/Snooper/Options.cs index e96b47f3..fc33b2cd 100644 --- a/FModel/Views/Snooper/Options.cs +++ b/FModel/Views/Snooper/Options.cs @@ -195,7 +195,7 @@ public class Options var bitmap = o switch { UTexture2D texture2D => texture2D.Decode(UserSettings.Default.PreviewMaxTextureSize, UserSettings.Default.CurrentDir.TexturePlatform), - UTexture2DArray texture2DArray => texture2DArray.DecodeTextureArray(null, UserSettings.Default.CurrentDir.TexturePlatform)?.FirstOrDefault(), + UTexture2DArray texture2DArray => texture2DArray.DecodeTextureArray(UserSettings.Default.CurrentDir.TexturePlatform)?.FirstOrDefault(), _ => o.Decode(UserSettings.Default.CurrentDir.TexturePlatform) };