From e71b959624e75a03daf9a394c8dcdf20dfdc19b6 Mon Sep 17 00:00:00 2001 From: Bertrand Songis Date: Mon, 22 Feb 2021 17:24:50 +0100 Subject: [PATCH] Prevents an infinite loop when a FormGroup has no widget which can accept the focus --- radio/src/thirdparty/libopenui/src/form.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/radio/src/thirdparty/libopenui/src/form.cpp b/radio/src/thirdparty/libopenui/src/form.cpp index eea53358c..2bec6e80e 100644 --- a/radio/src/thirdparty/libopenui/src/form.cpp +++ b/radio/src/thirdparty/libopenui/src/form.cpp @@ -196,14 +196,14 @@ void FormGroup::setFocus(uint8_t flag) else if (next) { next->setFocus(SET_FOCUS_FORWARD); } - else { + else if (!(windowFlags & NO_FOCUS)) { clearFocus(); focusWindow = this; } break; } } - else { + else if (!(windowFlags & NO_FOCUS)) { FormField::setFocus(flag); } }