From c13d2ed60d4f5609699e57439db71c5f5b1396fa Mon Sep 17 00:00:00 2001
From: Raphael Coeffic <raphael.coeffic@frafos.com>
Date: Thu, 26 May 2022 09:27:46 +0200
Subject: [PATCH] fix: initial focus on calibration screen

---
 radio/src/gui/colorlcd/radio_calibration.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/radio/src/gui/colorlcd/radio_calibration.cpp b/radio/src/gui/colorlcd/radio_calibration.cpp
index 3117ab22a..c2c8b5000 100644
--- a/radio/src/gui/colorlcd/radio_calibration.cpp
+++ b/radio/src/gui/colorlcd/radio_calibration.cpp
@@ -63,7 +63,7 @@ RadioCalibrationPage::RadioCalibrationPage(bool initial):
 {
   buildHeader(&header);
   buildBody(&body);
-  setFocus(SET_FOCUS_DEFAULT);
+  Window::setFocus(SET_FOCUS_DEFAULT);
 }
 
 void RadioCalibrationPage::buildHeader(Window * window)
@@ -230,6 +230,9 @@ void RadioCalibrationPage::onEvent(event_t event)
 
 void RadioCalibrationPage::nextStep()
 {
+  if (menuCalibrationState == CALIB_FINISHED)
+    deleteLater();
+
   menuCalibrationState++;
 
   switch (menuCalibrationState) {