From 10440e0da7c61c67e11a89c1f56f1d392388f487 Mon Sep 17 00:00:00 2001
From: Neil Horne <15316949+elecpower@users.noreply.github.com>
Date: Sat, 10 Jan 2026 13:45:30 +1100
Subject: [PATCH] fix(cpn): range check initial GV own value (#6972)

---
 companion/src/modeledit/gvars.cpp | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/companion/src/modeledit/gvars.cpp b/companion/src/modeledit/gvars.cpp
index 4680cf715..fb1304ac4 100644
--- a/companion/src/modeledit/gvars.cpp
+++ b/companion/src/modeledit/gvars.cpp
@@ -595,7 +595,15 @@ void GlobalVariablesPanel::useModeToggled(bool checked)
     int midx = 0;
 
     if (getIndexes(chk, gidx, midx)) {
-      int val = checked ? model->flightModeData->linkedGVarFlightModeZero(midx) : 0;
+      int val = 0;
+
+      if (checked)
+        val = model->flightModeData->linkedGVarFlightModeZero(midx);
+      else if (val < model->gvarData[gidx].getMin())
+        val = model->gvarData[gidx].getMin();
+      else if (val > model->gvarData[gidx].getMax())
+        val = model->gvarData[gidx].getMax();
+
       model->flightModeData[midx].gvars[gidx] = val;
       updateLine(gidx);
       emit modified();