From 15a84d9d7e421c021db7cf928fcfae2e4842ec93 Mon Sep 17 00:00:00 2001
From: Kurt <kaphotics@gmail.com>
Date: Sat, 11 Jun 2022 09:51:43 -0700
Subject: [PATCH] Minor clean

---
 .../Saves/Substructures/Misc/SlotGroup.cs     |  1 -
 PKHeX.Drawing.Misc/PKHeX.Drawing.Misc.csproj  |  1 +
 .../PKHeX.Drawing.PokeSprite.csproj           |  1 +
 PKHeX.WinForms/MainWindow/Main.cs             | 21 +++++++++++++++----
 PKHeX.WinForms/PKHeX.WinForms.csproj          |  1 +
 5 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/PKHeX.Core/Saves/Substructures/Misc/SlotGroup.cs b/PKHeX.Core/Saves/Substructures/Misc/SlotGroup.cs
index 52e95eb52..21f606db8 100644
--- a/PKHeX.Core/Saves/Substructures/Misc/SlotGroup.cs
+++ b/PKHeX.Core/Saves/Substructures/Misc/SlotGroup.cs
@@ -6,4 +6,3 @@ public sealed record SlotGroup(string GroupName, PKM[] Slots)
     public override string ToString() => $"{GroupName}: {Slots.Length} {Slots.GetType().Name}";
 #endif
 }
-
diff --git a/PKHeX.Drawing.Misc/PKHeX.Drawing.Misc.csproj b/PKHeX.Drawing.Misc/PKHeX.Drawing.Misc.csproj
index 7ab860a35..69beca84a 100644
--- a/PKHeX.Drawing.Misc/PKHeX.Drawing.Misc.csproj
+++ b/PKHeX.Drawing.Misc/PKHeX.Drawing.Misc.csproj
@@ -2,6 +2,7 @@
 
 	<PropertyGroup>
 		<TargetFrameworks>net6.0;net46</TargetFrameworks>
+		<NeutralLanguage>en</NeutralLanguage>
 		<LangVersion>10</LangVersion>
 		<Nullable>enable</Nullable>
 	</PropertyGroup>
diff --git a/PKHeX.Drawing.PokeSprite/PKHeX.Drawing.PokeSprite.csproj b/PKHeX.Drawing.PokeSprite/PKHeX.Drawing.PokeSprite.csproj
index 983929de0..3e54f8400 100644
--- a/PKHeX.Drawing.PokeSprite/PKHeX.Drawing.PokeSprite.csproj
+++ b/PKHeX.Drawing.PokeSprite/PKHeX.Drawing.PokeSprite.csproj
@@ -2,6 +2,7 @@
 
 	<PropertyGroup>
 		<TargetFrameworks>net6.0;net46</TargetFrameworks>
+		<NeutralLanguage>en</NeutralLanguage>
 		<LangVersion>10</LangVersion>
 		<Nullable>enable</Nullable>
 	</PropertyGroup>
diff --git a/PKHeX.WinForms/MainWindow/Main.cs b/PKHeX.WinForms/MainWindow/Main.cs
index aab8543cc..7249eb03c 100644
--- a/PKHeX.WinForms/MainWindow/Main.cs
+++ b/PKHeX.WinForms/MainWindow/Main.cs
@@ -117,17 +117,30 @@ private static void FormLoadInitialSettings(IEnumerable<string> args, out bool s
             showChangelog = false;
             BAKprompt = false;
 
-            HaX = args.Any(x => string.Equals(x.Trim('-'), nameof(HaX), StringComparison.CurrentCultureIgnoreCase))
-                || Path.GetFileNameWithoutExtension(Process.GetCurrentProcess().MainModule!.FileName!).EndsWith(nameof(HaX));
-
             FormLoadConfig(out BAKprompt, out showChangelog);
-            HaX |= Settings.Startup.ForceHaXOnLaunch;
+            HaX = Settings.Startup.ForceHaXOnLaunch || GetIsHaX(args);
 
             WinFormsUtil.AddSaveFileExtensions(Settings.Backup.OtherSaveFileExtensions);
             SaveFinder.CustomBackupPaths.Clear();
             SaveFinder.CustomBackupPaths.AddRange(Settings.Backup.OtherBackupPaths.Where(Directory.Exists));
         }
 
+        private static bool GetIsHaX(IEnumerable<string> args)
+        {
+            foreach (var x in args)
+            {
+                if (string.Equals(x.Trim('-'), nameof(HaX), StringComparison.CurrentCultureIgnoreCase))
+                    return true;
+            }
+
+#if !NET6_0_OR_GREATER
+            var path = Process.GetCurrentProcess().MainModule!.FileName!;
+#else
+            var path = Environment.ProcessPath!;
+#endif
+            return Path.GetFileNameWithoutExtension(path).EndsWith(nameof(HaX));
+        }
+
         private void FormLoadAddEvents()
         {
             C_SAV.Menu_Redo = Menu_Redo;
diff --git a/PKHeX.WinForms/PKHeX.WinForms.csproj b/PKHeX.WinForms/PKHeX.WinForms.csproj
index 447f52a85..5ce3d9a06 100644
--- a/PKHeX.WinForms/PKHeX.WinForms.csproj
+++ b/PKHeX.WinForms/PKHeX.WinForms.csproj
@@ -4,6 +4,7 @@
     <OutputType>WinExe</OutputType>
     <TargetFrameworks>net46;net6.0-windows</TargetFrameworks>
     <UseWindowsForms>true</UseWindowsForms>
+	<NeutralLanguage>en</NeutralLanguage>
     <PackageId>PKHeX</PackageId>
     <Company>Project Pokémon</Company>
     <Authors>Kaphotics</Authors>