From cf5c38fe8319aca3194b052b57c066a0c699e4d0 Mon Sep 17 00:00:00 2001
From: Thilo Graf <dbt@novatux.de>
Date: Tue, 27 Mar 2018 20:30:19 +0200
Subject: [PATCH] src/gui/widget/msgbox.cpp: add missing handling of RC_home
 message

Required in case of usage without explicit undefined home button.
---
 src/gui/widget/msgbox.cpp | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/gui/widget/msgbox.cpp b/src/gui/widget/msgbox.cpp
index 11aefe2f4..700698999 100644
--- a/src/gui/widget/msgbox.cpp
+++ b/src/gui/widget/msgbox.cpp
@@ -219,7 +219,7 @@ void CMsgBox::initButtons()
 	//define default selected button from default_result
 	if (v_buttons.size() > 1){
 		for (size_t i = 0; i< v_buttons.size(); i++){
-			if (v_buttons[i].btn_result == result){
+			if (v_buttons[i].btn_result == default_result){
 				ccw_footer->setSelectedButton(i);
 				break;
 			}
@@ -313,11 +313,16 @@ int CMsgBox::exec()
 				loop = false;
 			}
 		}
-		//***action button ok with preselected button***
+		//***action button 'ok' handled with selected button and its predefined result***
 		if ((msg == CRCInput::RC_ok) && (ccw_footer->getSelectedButtonObject()->getButtonAlias() == mb_show_button)){
 			result = (msg_result_t)ccw_footer->getSelectedButtonObject()->getButtonResult();
 			loop = false;
 		}
+		//***action button 'home' with general cancel result***
+		else if (msg == CRCInput::RC_home){
+			result = mbrCancel;
+			loop = false;
+		}
 		//***ignore***
 		else if (CNeutrinoApp::getInstance()->listModeKey(msg)){
 			// do nothing //TODO: if passed rc messages are ignored rc messaages: has no effect here too!!