From 17c3fcea8c4e6cbb7f2e30aa7946c240f15da5e5 Mon Sep 17 00:00:00 2001
From: iAmAsval <valentinbaudry64@gmail.com>
Date: Thu, 23 Dec 2021 23:03:04 +0100
Subject: [PATCH] so it was crashing the whole time and nobody noticed

---
 FModel/ViewModels/Commands/LoadCommand.cs | 19 +++++++++----------
 FModel/ViewModels/TabControlViewModel.cs  |  1 +
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/FModel/ViewModels/Commands/LoadCommand.cs b/FModel/ViewModels/Commands/LoadCommand.cs
index c9c85f3b..8b30d7c0 100644
--- a/FModel/ViewModels/Commands/LoadCommand.cs
+++ b/FModel/ViewModels/Commands/LoadCommand.cs
@@ -64,7 +64,7 @@ namespace FModel.ViewModels.Commands
             await _applicationView.CUE4Parse.LoadVirtualPaths(); // load virtual paths if not already loaded
             Helper.CloseWindow<AdonisWindow>("Search View"); // close search window if opened
 
-            await _threadWorkerView.Begin(async cancellationToken =>
+            await _threadWorkerView.Begin(cancellationToken =>
             {
                 // filter what to show
                 switch (UserSettings.Default.LoadingMode)
@@ -87,7 +87,7 @@ namespace FModel.ViewModels.Commands
                     case ELoadingMode.AllButNew:
                     case ELoadingMode.AllButModified:
                     {
-                        await FilterNewOrModifiedFilesToDisplay(cancellationToken).ConfigureAwait(false);
+                        FilterNewOrModifiedFilesToDisplay(cancellationToken);
                         break;
                     }
                     default: throw new ArgumentOutOfRangeException();
@@ -141,7 +141,7 @@ namespace FModel.ViewModels.Commands
             _applicationView.CUE4Parse.AssetsFolder.BulkPopulate(entries);
         }
 
-        private async Task FilterNewOrModifiedFilesToDisplay(CancellationToken cancellationToken)
+        private void FilterNewOrModifiedFilesToDisplay(CancellationToken cancellationToken)
         {
             var openFileDialog = new OpenFileDialog
             {
@@ -156,20 +156,19 @@ namespace FModel.ViewModels.Commands
             FLogger.AppendInformation();
             FLogger.AppendText($"Backup file older than current game is '{openFileDialog.FileName.SubstringAfterLast("\\")}'", Constants.WHITE, true);
 
-            await using var fileStream = new FileStream(openFileDialog.FileName, FileMode.Open);
-            await using var memoryStream = new MemoryStream();
+            using var fileStream = new FileStream(openFileDialog.FileName, FileMode.Open);
+            using var memoryStream = new MemoryStream();
 
             if (fileStream.ReadUInt32() == _IS_LZ4)
             {
                 fileStream.Position -= 4;
-                await using var compressionStream = LZ4Stream.Decode(fileStream);
-                await compressionStream.CopyToAsync(memoryStream, cancellationToken).ConfigureAwait(false);
+                using var compressionStream = LZ4Stream.Decode(fileStream);
+                compressionStream.CopyTo(memoryStream);
             }
-            else
-                await fileStream.CopyToAsync(memoryStream, cancellationToken).ConfigureAwait(false);
+            else fileStream.CopyTo(memoryStream);
 
             memoryStream.Position = 0;
-            await using var archive = new FStreamArchive(fileStream.Name, memoryStream);
+            using var archive = new FStreamArchive(fileStream.Name, memoryStream);
             var entries = new List<VfsEntry>();
 
             switch (UserSettings.Default.LoadingMode)
diff --git a/FModel/ViewModels/TabControlViewModel.cs b/FModel/ViewModels/TabControlViewModel.cs
index 21ee7b7e..1f0f2ab8 100644
--- a/FModel/ViewModels/TabControlViewModel.cs
+++ b/FModel/ViewModels/TabControlViewModel.cs
@@ -218,6 +218,7 @@ namespace FModel.ViewModels
             {
                 _images.Clear();
                 SelectedImage = null;
+                RaisePropertyChanged("HasMultipleImages");
             });
         }