From b9eeaf74dc2793141e93cd3c6b4cb7cabac4716b Mon Sep 17 00:00:00 2001
From: Thilo Graf <dbt@novatux.de>
Date: Tue, 27 Dec 2016 13:15:32 +0100
Subject: [PATCH] Revert "CStringInput: remove possible display of
 NONEXISTANT_LOCALE"

This reverts commit 4e853d98c2b2b289f0dce1c7dc9fed53eb317ce1.

Conflicts:
	src/gui/widget/stringinput.cpp
---
 src/gui/widget/stringinput.cpp | 16 +++++++++-------
 src/gui/widget/stringinput.h   |  3 ++-
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/src/gui/widget/stringinput.cpp b/src/gui/widget/stringinput.cpp
index 037d270e0..8d6d5e5ff 100644
--- a/src/gui/widget/stringinput.cpp
+++ b/src/gui/widget/stringinput.cpp
@@ -47,7 +47,8 @@
 
 CStringInput::CStringInput(const neutrino_locale_t Name, std::string* Value, int Size, const neutrino_locale_t Hint_1, const neutrino_locale_t Hint_2, const char * const Valid_Chars, CChangeObserver* Observ, const char * const Icon)
 {
-	title = g_Locale->getText(Name);
+        name =  Name;
+	head = g_Locale->getText(Name);
         valueString = Value;
 	lower_bound = -1;
 	upper_bound = -1;
@@ -64,7 +65,8 @@ CStringInput::CStringInput(const neutrino_locale_t Name, std::string* Value, int
 
 CStringInput::CStringInput(const std::string &Name, std::string *Value, int Size, const neutrino_locale_t Hint_1, const neutrino_locale_t Hint_2, const char * const Valid_Chars, CChangeObserver* Observ, const char * const Icon)
 {
-        title = Name;
+	name = NONEXISTANT_LOCALE;
+        head = Name;
         valueString = Value;
 	lower_bound = -1;
 	upper_bound = -1;
@@ -113,7 +115,7 @@ void CStringInput::init()
 
 	width = std::max(size*input_w + 2*offset, (int) frameBuffer->getScreenWidth() / 100 * 45);
 
-	int tmp_w = g_Font[SNeutrinoSettings::FONT_TYPE_MENU_TITLE]->getRenderWidth(title);
+	int tmp_w = g_Font[SNeutrinoSettings::FONT_TYPE_MENU_TITLE]->getRenderWidth(head);
 
 	if (!(iconfile.empty()))
 	{
@@ -495,7 +497,7 @@ int CStringInput::exec( CMenuTarget* parent, const std::string & )
 		else if ( (msg==CRCInput::RC_home) || (msg==CRCInput::RC_timeout) )
 		{
 			if ((trim (*valueString) != trim(oldval)) &&
-			     (ShowMsg(title, LOCALE_MESSAGEBOX_DISCARD, CMsgBox::mbrYes, CMsgBox::mbYes | CMsgBox::mbCancel) == CMsgBox::mbrCancel)) {
+			     (ShowMsg(name, LOCALE_MESSAGEBOX_DISCARD, CMsgBox::mbrYes, CMsgBox::mbYes | CMsgBox::mbCancel) == CMsgBox::mbrCancel)) {
 				timeoutEnd = CRCInput::calcTimeoutEnd(g_settings.timing[SNeutrinoSettings::TIMING_MENU] == 0 ? 0xFFFF : g_settings.timing[SNeutrinoSettings::TIMING_MENU]);
 				continue;
 			}
@@ -540,7 +542,7 @@ int CStringInput::exec( CMenuTarget* parent, const std::string & )
 
         if ( (observ) && (msg==CRCInput::RC_ok) )
         {
-                observ->changeNotify(title, (void *) valueString->c_str());
+                observ->changeNotify(name, (void *) valueString->c_str());
         }
 	return res;
 }
@@ -561,7 +563,7 @@ void CStringInput::paint(bool sms)
 	frameBuffer->paintBoxRel(x + OFFSET_SHADOW, y + OFFSET_SHADOW, width, height, COL_SHADOW_PLUS_0, RADIUS_LARGE, CORNER_ALL); //round
 	frameBuffer->paintBoxRel(x, y + hheight, width, bheight, COL_MENUCONTENT_PLUS_0, sms ? 0 : RADIUS_LARGE, CORNER_BOTTOM);
 
-	CComponentsHeader header(x, y, width, hheight, title, iconfile);
+	CComponentsHeader header(x, y, width, hheight, head, iconfile);
 	header.paint(CC_SAVE_SCREEN_NO);
 
 	int tmp_y = y+ hheight+ offset+ input_h+ offset;
@@ -859,7 +861,7 @@ int CPINInput::exec( CMenuTarget* parent, const std::string & )
 
 	if ( (observ) && (msg==CRCInput::RC_ok) )
 	{
-		observ->changeNotify(title, (void *) valueString->c_str());
+		observ->changeNotify(name, (void *) valueString->c_str());
 	}
 
 	return res;
diff --git a/src/gui/widget/stringinput.h b/src/gui/widget/stringinput.h
index 8b0f69b5c..d435a7f84 100644
--- a/src/gui/widget/stringinput.h
+++ b/src/gui/widget/stringinput.h
@@ -53,7 +53,8 @@ class CStringInput : public CMenuTarget
 
 		uint32_t smstimer;
 
-		std::string  title;
+		std::string  head;
+		neutrino_locale_t name;
 		neutrino_locale_t hint_1, hint_2;
 		std::string iconfile;
 		const char * validchars;