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 @@
net6.0;net46
+ en
10
enable
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 @@
net6.0;net46
+ en
10
enable
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 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 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 @@
WinExe
net46;net6.0-windows
true
+ en
PKHeX
Project Pokémon
Kaphotics