From 9f380bf424d370ba28b71d83fbf7d72f13d457db Mon Sep 17 00:00:00 2001
From: M4x1m3 <M4x1me@protonmail.com>
Date: Tue, 2 Mar 2021 16:09:09 +0100
Subject: [PATCH] [apps/settings] Fixed broken about submenu

---
 apps/settings/sub_menu/about_controller.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/apps/settings/sub_menu/about_controller.cpp b/apps/settings/sub_menu/about_controller.cpp
index 53962af66..0ce684d0c 100644
--- a/apps/settings/sub_menu/about_controller.cpp
+++ b/apps/settings/sub_menu/about_controller.cpp
@@ -29,7 +29,7 @@ AboutController::AboutController(Responder * parentResponder) :
 }
 
 bool AboutController::handleEvent(Ion::Events::Event event) {
-  I18n::Message childLabel = m_messageTreeModel->childAtIndex(selectedRow())->label();
+  I18n::Message childLabel = m_messageTreeModel->childAtIndex(selectedRow()+(!hasUsernameCell()))->label();
   /* We hide here the activation hardware test app: in the menu "about", by
    * clicking on '6' on the last row. */
   if ((event == Ion::Events::Six || event == Ion::Events::LowerT || event == Ion::Events::UpperT) && childLabel == I18n::Message::FccId) {
@@ -39,7 +39,7 @@ bool AboutController::handleEvent(Ion::Events::Event event) {
   if (event == Ion::Events::OK || event == Ion::Events::EXE || event == Ion::Events::Right) {
     if (childLabel == I18n::Message::Contributors) {
       GenericSubController * subController = &m_contributorsController;
-      subController->setMessageTreeModel(m_messageTreeModel->childAtIndex(selectedRow()));
+      subController->setMessageTreeModel(m_messageTreeModel->childAtIndex(selectedRow()+(!hasUsernameCell())));
       StackViewController * stack = stackController();
       stack->push(subController);
       return true;