From 935e0ece897215f46b404332f21cc6a877e5d25f Mon Sep 17 00:00:00 2001 From: vanhofen Date: Tue, 29 Dec 2015 12:10:27 +0100 Subject: [PATCH] user_menu: allow controlable return_title value Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/9325385ce9d479dcf591c4831632b1ed59e87a2a Author: vanhofen Date: 2015-12-29 (Tue, 29 Dec 2015) Origin message was: ------------------ - user_menu: allow controlable return_title value ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- src/gui/user_menue.cpp | 3 +-- src/gui/user_menue.h | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/gui/user_menue.cpp b/src/gui/user_menue.cpp index ac21a8602..bb6109591 100644 --- a/src/gui/user_menue.cpp +++ b/src/gui/user_menue.cpp @@ -478,13 +478,12 @@ bool CUserMenu::showUserMenu(neutrino_msg_t msg) return true; } -const char *CUserMenu::getUserMenuButtonName(int button, bool &active) +const char *CUserMenu::getUserMenuButtonName(int button, bool &active, bool return_title) { active = false; if(button < 0 || button >= (int) g_settings.usermenu.size()) return ""; - bool return_title = false; neutrino_locale_t loc = NONEXISTANT_LOCALE; const char *text = NULL; diff --git a/src/gui/user_menue.h b/src/gui/user_menue.h index 5d15efa5b..33a90f0c2 100644 --- a/src/gui/user_menue.h +++ b/src/gui/user_menue.h @@ -76,7 +76,7 @@ class CUserMenu : public CChangeObserver CUserMenu(); ~CUserMenu(); bool showUserMenu(neutrino_msg_t msg); - static const char *getUserMenuButtonName(int button, bool &active); + static const char *getUserMenuButtonName(int button, bool &active, bool return_title = false); };