Update v3.0.5.5

TexTools · Jul 12, 2024 · 56f4385 · 56f4385
2 parents 2c42ea6 + 938be47
commit 56f4385
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 10 deletions.
diff --git a/FFXIV_TexTools/FFXIV_TexTools.csproj b/FFXIV_TexTools/FFXIV_TexTools.csproj
@@ -23,9 +23,9 @@
     <Product>FFXIV_TexTools</Product>
     <Copyright>Copyright ©  2024</Copyright>
 
-    <ApplicationVersion>3.0.5.4</ApplicationVersion>
-    <AssemblyVersion>3.0.5.4</AssemblyVersion>
-    <FileVersion>3.0.5.4</FileVersion>
+    <ApplicationVersion>3.0.5.5</ApplicationVersion>
+    <AssemblyVersion>3.0.5.5</AssemblyVersion>
+    <FileVersion>3.0.5.5</FileVersion>
 
     <LangVersion>9.0</LangVersion>
     <UseWPF>true</UseWPF>

diff --git a/FFXIV_TexTools/MainWindow.xaml.cs b/FFXIV_TexTools/MainWindow.xaml.cs
@@ -548,9 +548,13 @@ await Task.Run(async () =>
                         }
 
                     }
-                    FlexibleMessageBox.Show(("An error occurred while attempting to rebuild the cache. This may be caused by this version of Final Fantasy XIV " +
-                        "not being supported by this version of TexTools.\n\n").L() + ex.Message, "Cache Rebuild Error.".L(), MessageBoxButtons.OK,  MessageBoxIcon.Error, 
-                        MessageBoxDefaultButton.Button1);
+
+                    Application.Current.Dispatcher.Invoke(() =>
+                    {
+                        FlexibleMessageBox.Show(("An error occurred while attempting to rebuild the cache. This may be caused by this version of Final Fantasy XIV " +
+                            "not being supported by this version of TexTools.\n\n").L() + ex.Message, "Cache Rebuild Error.".L(), MessageBoxButtons.OK,  MessageBoxIcon.Error, 
+                            MessageBoxDefaultButton.Button1);
+                    });
                 }
 
                 try
@@ -559,12 +563,18 @@ await Task.Run(async () =>
 
                     if (!await tx.FileExists(Eqp.DawntrailTestFile, true))
                     {
-                        this.ShowWarning("Non-Dawntrail Install", "TexTools is currently assigned to a Endwalker or previous install.\n\nMany parts of the application will not operate correctly on old FFXIV installs.");
+                        Application.Current.Dispatcher.Invoke(() =>
+                        {
+                            this.ShowWarning("Non-Dawntrail Install", "TexTools is currently assigned to a Endwalker or previous install.\n\nMany parts of the application will not operate correctly on old FFXIV installs.");
+                        });
                     }
                 }
                 catch(Exception ex)
                 {
-                    this.ShowWarning("Unable to read base game files.  FFXIV Install location may be corrupt or invalid:\n" + Settings.Default.FFXIV_Directory, "Unable to Read Files");
+                    Application.Current.Dispatcher.Invoke(() =>
+                    {
+                        this.ShowWarning("Unable to read base game files.  FFXIV Install location may be corrupt or invalid:\n" + Settings.Default.FFXIV_Directory, "Unable to Read Files");
+                    });
                 }
 
                 await Dispatcher.Invoke(async () =>

diff --git a/FFXIV_TexTools/Views/Upgrades/PenumbraLibraryUpgradeWindow.xaml.cs b/FFXIV_TexTools/Views/Upgrades/PenumbraLibraryUpgradeWindow.xaml.cs
@@ -397,7 +397,10 @@ await Task.Run(async () =>
                     }
                     catch
                     {
-                        ViewHelpers.ShowWarning(this, "Temp File Clear Error", "Unable to clear TexTools temp folder.\nThe mod as converted successfully, cannot clear its temp folder due to unusual permissions issues with some mod file that was used.\n\nPlease manually delete the folder: %TEMP%/xivmf/\n\n(The upgrade process has been paused.)");
+                        Application.Current.Dispatcher.Invoke(() =>
+                        {
+                            ViewHelpers.ShowWarning(this, "Temp File Clear Error", "Unable to clear TexTools temp folder.\nThe mod as converted successfully, cannot clear its temp folder due to unusual permissions issues with some mod file that was used.\n\nPlease manually delete the folder: %TEMP%/xivmf/\n\n(The upgrade process has been paused.)");
+                        });
                         _RequestStop = true;
                     }
 

diff --git a/lib/xivModdingFramework b/lib/xivModdingFramework