Update v3.0.0.9

TexTools · Jun 28, 2024 · 45e6e77 · 45e6e77
2 parents b986c6d + 526e80e
commit 45e6e77
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 5 deletions.
diff --git a/FFXIV_TexTools/FFXIV_TexTools.csproj b/FFXIV_TexTools/FFXIV_TexTools.csproj
@@ -23,8 +23,8 @@
     <AssemblyTitle>FFXIV_TexTools</AssemblyTitle>
     <Product>FFXIV_TexTools</Product>
     <Copyright>Copyright ©  2024</Copyright>
-    <AssemblyVersion>3.0.0.8</AssemblyVersion>
-    <FileVersion>3.0.0.8</FileVersion>
+    <AssemblyVersion>3.0.0.9</AssemblyVersion>
+    <FileVersion>3.0.0.9</FileVersion>
     <LangVersion>9.0</LangVersion>
     <OutputPath>bin\$(Configuration)\</OutputPath>
     <UseWPF>true</UseWPF>

diff --git a/FFXIV_TexTools/Views/Metadata/RacialSettingsEditor.xaml.cs b/FFXIV_TexTools/Views/Metadata/RacialSettingsEditor.xaml.cs
@@ -55,6 +55,15 @@ public RacialSettingsEditor()
                 femaleButton.SetValue(Grid.ColumnProperty, clanId);
                 FemaleGrid.Children.Add(femaleButton);
             }
+            Closing += RacialSettingsEditor_Closing;
+        }
+
+        private void RacialSettingsEditor_Closing(object sender, System.ComponentModel.CancelEventArgs e)
+        {
+            if(Owner != null)
+            {
+                Owner.Activate();
+            }
         }
 
         private Button MakeButton(XivSubRace race, XivGender gender)
@@ -73,13 +82,19 @@ private Button MakeButton(XivSubRace race, XivGender gender)
             return btn;
         }
 
-        private void Btn_Click(object sender, RoutedEventArgs e)
+        private async void Btn_Click(object sender, RoutedEventArgs e)
         {
             var context = ((ButtonContext)((Button)e.Source).DataContext);
             var wind = new RaceGenderScalingEditor(context.Race, context.Gender) { Owner = this };
             wind.WindowStartupLocation = WindowStartupLocation.CenterOwner;
 
-            _ = wind.Init();
+            try
+            {
+                await wind.Init();
+            } catch(Exception ex)
+            {
+                ViewHelpers.ShowError("Racial Settings Error", "An error occurred in the racial settings menu: \n\n" + ex.Message);
+            }
         }
 
         private void DoneButton_Click(object sender, RoutedEventArgs e)

diff --git a/lib/xivModdingFramework b/lib/xivModdingFramework
+12 −10		xivModdingFramework/Helpers/EndwalkerUpgrade.cs
+6 −0		xivModdingFramework/Mods/FileTypes/PMP.cs