From e5dae038b7c1c33198c83a58e59a67b356ba0940 Mon Sep 17 00:00:00 2001
From: SkrubbySkrubInAShrub <skrubbyskrubinashrub@gmail.com>
Date: Sat, 18 Apr 2026 00:42:38 +0200
Subject: [PATCH] fix(weather-picker): allow forcing a different weather with a
 lock active

---
 src/Features/WeatherEditor.cpp | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/Features/WeatherEditor.cpp b/src/Features/WeatherEditor.cpp
index 2c012853c4..764787b988 100644
--- a/src/Features/WeatherEditor.cpp
+++ b/src/Features/WeatherEditor.cpp
@@ -685,6 +685,12 @@ void WeatherEditor::RenderWeatherControls(RE::Sky* sky)
 				else
 					sky->SetWeather(selectedWeather, true, false);
 
+				// If the lock is active, retarget it to the newly chosen weather so
+				// Prepass() enforces the new choice instead of reverting it.
+				if (editorWindow->IsWeatherLocked()) {
+					editorWindow->lockedWeather = selectedWeather;
+				}
+
 				Util::ClearComboSearch(kWeatherSearchId);
 				logger::info("[WeatherEditor] Changed weather to: {}", Util::FormatWeather(selectedWeather));
 				break;