From 7a6d154d3e74bd4d6b7db6a69d6babd70361432d Mon Sep 17 00:00:00 2001
From: Eddoursul <git@eddoursul.win>
Date: Tue, 27 Jan 2026 05:52:12 +0100
Subject: [PATCH] Moved experimental crash fixes to a subdirectory

---
 SKSE/Plugins/EnderalSE.ini                           |  1 +
 .../CrosshairPickDataCrashFix.h                      |  0
 .../MovementPathFollowerCrashFix.h                   |  0
 source/Enderal DLL/src/Main.cpp                      | 12 ++++++------
 4 files changed, 7 insertions(+), 6 deletions(-)
 rename source/Enderal DLL/src/{Patches => CrashFixes}/CrosshairPickDataCrashFix.h (100%)
 rename source/Enderal DLL/src/{Patches => CrashFixes}/MovementPathFollowerCrashFix.h (100%)

diff --git a/SKSE/Plugins/EnderalSE.ini b/SKSE/Plugins/EnderalSE.ini
index c0b2766bc..b8afed914 100644
--- a/SKSE/Plugins/EnderalSE.ini
+++ b/SKSE/Plugins/EnderalSE.ini
@@ -9,3 +9,4 @@ AttachLightHitEffectCrashFix = true
 AutoScaleHeroMenu = true
 WarnFormTypeCollisions = true
 GogVramLeakFix = true
+ExperimentalCrashFixes = false
diff --git a/source/Enderal DLL/src/Patches/CrosshairPickDataCrashFix.h b/source/Enderal DLL/src/CrashFixes/CrosshairPickDataCrashFix.h
similarity index 100%
rename from source/Enderal DLL/src/Patches/CrosshairPickDataCrashFix.h
rename to source/Enderal DLL/src/CrashFixes/CrosshairPickDataCrashFix.h
diff --git a/source/Enderal DLL/src/Patches/MovementPathFollowerCrashFix.h b/source/Enderal DLL/src/CrashFixes/MovementPathFollowerCrashFix.h
similarity index 100%
rename from source/Enderal DLL/src/Patches/MovementPathFollowerCrashFix.h
rename to source/Enderal DLL/src/CrashFixes/MovementPathFollowerCrashFix.h
diff --git a/source/Enderal DLL/src/Main.cpp b/source/Enderal DLL/src/Main.cpp
index a7b40e3cd..da2b3cb9c 100644
--- a/source/Enderal DLL/src/Main.cpp	
+++ b/source/Enderal DLL/src/Main.cpp	
@@ -16,8 +16,8 @@
 #include "Patches/PluginsTxtPatch.h"
 #include "Patches/FormTypeCollisionDetector.h"
 #include "Patches/GogVramLeakFix.h"
-#include "Patches/CrosshairPickDataCrashFix.h"
-#include "Patches/MovementPathFollowerCrashFix.h"
+#include "CrashFixes/CrosshairPickDataCrashFix.h"
+#include "CrashFixes/MovementPathFollowerCrashFix.h"
 
 using namespace SKSE;
 
@@ -33,7 +33,7 @@ static std::map<std::string, bool> g_settings{
 	{ "AttachLightHitEffectCrashFix", true },
 	{ "AutoScaleHeroMenu", true },
 	{ "GogVramLeakFix", true },
-	{ "CrosshairPickDataCrashFix", true }
+	{ "ExperimentalCrashFixes", false }
 };
 
 namespace {
@@ -83,12 +83,12 @@ namespace {
 						logger::info("Installing light attach crash fix...");
 						AttachLightHitEffectCrash::Install();
 					}
-					if (g_settings.at("CrosshairPickDataCrashFix")) {
+					if (g_settings.at("ExperimentalCrashFixes")) {
 						logger::info("Installing crosshair pick data crash fix...");
 						CrosshairPickDataCrashFix::Install();
+						logger::info("Installing movement path follower crash fix...");
+						MovementPathFollowerCrashFix::Install();
 					}
-					logger::info("Installing movement path follower crash fix...");
-					MovementPathFollowerCrashFix::Install();
 					if (g_settings.at("StayAtSystemPage")) {
 						if (const auto pluginInfo = GetLoadInterface()->GetPluginInfo("StayAtSystemPage"); pluginInfo) {
 							MessageBoxW(NULL, L"Stay At The System Page is already included in Enderal, please, disable it.", L"Enderal SE Error", MB_OK | MB_ICONERROR);