From a904932788d6bde2b1a61cf3e19af41fa772f592 Mon Sep 17 00:00:00 2001 From: 3djc Date: Mon, 2 Sep 2024 01:41:53 +0200 Subject: [PATCH] fix(bw): prevent autodetection of unavailable sources (#5488) --- radio/src/gui/navigation/navigation_9x.cpp | 4 +++- radio/src/gui/navigation/navigation_x7.cpp | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/radio/src/gui/navigation/navigation_9x.cpp b/radio/src/gui/navigation/navigation_9x.cpp index 04993d8b8..876ce6cf3 100644 --- a/radio/src/gui/navigation/navigation_9x.cpp +++ b/radio/src/gui/navigation/navigation_9x.cpp @@ -89,7 +89,9 @@ int checkIncDec(event_t event, int val, int i_min, int i_max, int srcMin, int sr } } - newval = checkMovedInput(newval, i_min, i_max, i_flags, isSource); + auto moved = checkMovedInput(newval, i_min, i_max, i_flags, isSource); + if (isValueAvailable(moved)) + newval = moved; if (invert) { newval = -newval; diff --git a/radio/src/gui/navigation/navigation_x7.cpp b/radio/src/gui/navigation/navigation_x7.cpp index 089c97b83..448ac297f 100644 --- a/radio/src/gui/navigation/navigation_x7.cpp +++ b/radio/src/gui/navigation/navigation_x7.cpp @@ -103,7 +103,9 @@ int checkIncDec(event_t event, int val, int i_min, int i_max, int srcMin, int sr } } - newval = checkMovedInput(newval, i_min, i_max, i_flags, isSource); + auto moved = checkMovedInput(newval, i_min, i_max, i_flags, isSource); + if (isValueAvailable(moved)) + newval = moved; if (invert) { newval = -newval;