From a40aeb03559578a0133e145aca50c77e487001cd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89milie=20Feral?= <emilie.feral@numworks.com>
Date: Thu, 25 Oct 2018 15:32:42 +0200
Subject: [PATCH] [escher] NestedMenuController: Fix bug, select leaf or sub
 menu only if there is a selected row

---
 escher/src/nested_menu_controller.cpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/escher/src/nested_menu_controller.cpp b/escher/src/nested_menu_controller.cpp
index eaf883219..1844e3673 100644
--- a/escher/src/nested_menu_controller.cpp
+++ b/escher/src/nested_menu_controller.cpp
@@ -139,6 +139,9 @@ bool NestedMenuController::handleEventForRow(Ion::Events::Event event, int rowIn
   if ((event == Ion::Events::Back || event == Ion::Events::Left) && depth > 0) {
     return returnToPreviousMenu();
   }
+  if (selectedRow() < 0) {
+    return false;
+  }
   if ((event == Ion::Events::OK || event == Ion::Events::EXE || event == Ion::Events::Right) && typeAtLocation(0, selectedRow()) == NodeCellType) {
     return selectSubMenu(rowIndex);
   }