From d047b56978bd7ba9870cf502d8d4d66ce9c83039 Mon Sep 17 00:00:00 2001
From: 4sval <asval.contactme@gmail.com>
Date: Sun, 9 Oct 2022 23:25:29 +0200
Subject: [PATCH] stuff

---
 CUE4Parse                                  | 2 +-
 FModel/Creator/Bases/FN/BaseIcon.cs        | 2 +-
 FModel/MainWindow.xaml.cs                  | 6 +++---
 FModel/ViewModels/CUE4ParseViewModel.cs    | 4 ++--
 FModel/ViewModels/ThreadWorkerViewModel.cs | 1 -
 5 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/CUE4Parse b/CUE4Parse
index f535bd00..5ea2543c 160000
--- a/CUE4Parse
+++ b/CUE4Parse
@@ -1 +1 @@
-Subproject commit f535bd0092024e5cc26794424ac8b83777ad4522
+Subproject commit 5ea2543cefa613ac7e49481bfb8977bf20d38238
diff --git a/FModel/Creator/Bases/FN/BaseIcon.cs b/FModel/Creator/Bases/FN/BaseIcon.cs
index 897fbbfd..b4ba0a3b 100644
--- a/FModel/Creator/Bases/FN/BaseIcon.cs
+++ b/FModel/Creator/Bases/FN/BaseIcon.cs
@@ -2,6 +2,7 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Windows;
+using CUE4Parse.GameTypes.FN.Enums;
 using CUE4Parse.UE4.Assets.Exports;
 using CUE4Parse.UE4.Assets.Exports.Engine;
 using CUE4Parse.UE4.Assets.Exports.Material;
@@ -12,7 +13,6 @@ using CUE4Parse.UE4.Objects.Core.Math;
 using CUE4Parse.UE4.Objects.GameplayTags;
 using CUE4Parse.UE4.Objects.UObject;
 using CUE4Parse_Conversion.Textures;
-using CUE4Parse.GameTypes.FN.Enums;
 using FModel.Settings;
 using SkiaSharp;
 
diff --git a/FModel/MainWindow.xaml.cs b/FModel/MainWindow.xaml.cs
index ed12174e..e623ccd3 100644
--- a/FModel/MainWindow.xaml.cs
+++ b/FModel/MainWindow.xaml.cs
@@ -77,9 +77,9 @@ public partial class MainWindow
             _discordHandler.Initialize(_applicationView.CUE4Parse.Game);
 
 #if DEBUG
-        await _threadWorkerView.Begin(_ =>
-            _applicationView.CUE4Parse.Extract(
-                "/Game/Weapons/FORT_Melee/Pickaxe_Slurp_Monster/Meshes/Slurp_Monster_Axe.uasset"));
+        await _threadWorkerView.Begin(cancellationToken =>
+            _applicationView.CUE4Parse.Extract(cancellationToken,
+                "FortniteGame/Content/Characters/Player/Male/Medium/Bodies/M_MED_Despair/Meshes/M_MED_Despair.uasset"));
 #endif
     }
 
diff --git a/FModel/ViewModels/CUE4ParseViewModel.cs b/FModel/ViewModels/CUE4ParseViewModel.cs
index 793b10dc..b766165d 100644
--- a/FModel/ViewModels/CUE4ParseViewModel.cs
+++ b/FModel/ViewModels/CUE4ParseViewModel.cs
@@ -536,7 +536,7 @@ public class CUE4ParseViewModel : ViewModel
             case "uasset":
             case "umap":
             {
-                var exports = Provider.LoadObjectExports(fullPath);
+                var exports = Provider.LoadObjectExports(fullPath); // cancellationToken
                 TabControl.SelectedTab.SetDocumentText(JsonConvert.SerializeObject(exports, Formatting.Indented), bulkSave);
                 if (bulkSave) break;
 
@@ -709,7 +709,7 @@ public class CUE4ParseViewModel : ViewModel
         TabControl.AddTab(fullPath.SubstringAfterLast('/'), fullPath.SubstringBeforeLast('/'));
         TabControl.SelectedTab.ScrollTrigger = objectName;
 
-        var exports = Provider.LoadObjectExports(fullPath);
+        var exports = Provider.LoadObjectExports(fullPath); // cancellationToken
         TabControl.SelectedTab.Highlighter = AvalonExtensions.HighlighterSelector(""); // json
         TabControl.SelectedTab.SetDocumentText(JsonConvert.SerializeObject(exports, Formatting.Indented), false);
 
diff --git a/FModel/ViewModels/ThreadWorkerViewModel.cs b/FModel/ViewModels/ThreadWorkerViewModel.cs
index dc6ad853..8ebb4413 100644
--- a/FModel/ViewModels/ThreadWorkerViewModel.cs
+++ b/FModel/ViewModels/ThreadWorkerViewModel.cs
@@ -1,5 +1,4 @@
 using System;
-using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
 using FModel.Framework;