From b43d77305174df97c4dc8aeca9325cc73b671b86 Mon Sep 17 00:00:00 2001
From: Yaya-Cout <yaya.cout@free.fr>
Date: Wed, 8 Feb 2023 17:09:48 +0100
Subject: [PATCH] [calculation/UnitList] Fix crash when pressing OK

---
 .../additional_outputs/unit_list_controller.cpp            | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/apps/calculation/additional_outputs/unit_list_controller.cpp b/apps/calculation/additional_outputs/unit_list_controller.cpp
index 41ac6d8f2..37fdcf776 100644
--- a/apps/calculation/additional_outputs/unit_list_controller.cpp
+++ b/apps/calculation/additional_outputs/unit_list_controller.cpp
@@ -24,7 +24,12 @@ bool UnitListController::handleEvent(Ion::Events::Event event) {
   if (selectedRow() == 0 && (event == Ion::Events::OK || event == Ion::Events::EXE)) {
     return true;
   }
-  return ListController::handleEvent(event);
+
+  // HACK: Change the selected row (prevent some bugs when OK is pressed)
+  selectRow(selectedRow() - 1);
+  bool value = ListController::handleEvent(event);
+  selectRow(selectedRow() + 1);
+  return value;
 }
 
 void UnitListController::setExpression(Poincare::Expression e) {