From 63b648fb3e5ec7bce6bacb59503b255e000a485a Mon Sep 17 00:00:00 2001
From: vanhofen <vanhofen@gmx.de>
Date: Sun, 26 Mar 2017 23:21:29 +0200
Subject: [PATCH] menue: fix lcd4l-support for directly started items; ...

this fixes missing lcd4l-support in mode_upnp


Origin commit data
------------------
Commit: https://github.com/neutrino-images/ni-neutrino/commit/da62cd195ba2d9c4d542858ce14be17585a76afc
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-26 (Sun, 26 Mar 2017)

Origin message was:
------------------
- menue: fix lcd4l-support for directly started items; ...

this fixes missing lcd4l-support in mode_upnp
---
 src/gui/widget/menue.cpp | 20 +++++++++++++++++---
 src/gui/widget/menue.h   |  3 +++
 2 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/src/gui/widget/menue.cpp b/src/gui/widget/menue.cpp
index 371f706c4..0e14e3a78 100644
--- a/src/gui/widget/menue.cpp
+++ b/src/gui/widget/menue.cpp
@@ -95,6 +95,8 @@ CMenuItem::CMenuItem(bool Active, neutrino_msg_t DirectKey, const char * const I
 	height = 0;
 	actObserv	= NULL;
 	parent_widget	= NULL;
+
+	lcd4l_text	= ""; //NI lcd4l-support
 }
 
 void CMenuItem::init(const int X, const int Y, const int DX, const int OFFX)
@@ -222,15 +224,19 @@ void CMenuItem::paintItemCaption(const bool select_mode, const char * right_text
 			CVFD::getInstance()->showMenuText(0, str, -1, true);
 			//NI lcd4l-support
 			if(g_settings.lcd4l_support)
-				LCD4l->CreateFile("/tmp/lcd/menu", str, g_settings.lcd4l_convert);
+				lcd4l_text = str;
 		} 
 		else
 		{
 			CVFD::getInstance()->showMenuText(0, left_text, -1, true);
 			//NI lcd4l-support
-			if(g_settings.lcd4l_support)
-				LCD4l->CreateFile("/tmp/lcd/menu", left_text, g_settings.lcd4l_convert);
+			if (g_settings.lcd4l_support)
+				lcd4l_text = left_text;
 		}
+
+		//NI lcd4l-support
+		if (g_settings.lcd4l_support)
+			LCD4l->CreateFile("/tmp/lcd/menu", lcd4l_text, g_settings.lcd4l_convert);
 	}
 	
 	//left text
@@ -938,6 +944,9 @@ int CMenuWidget::exec(CMenuTarget* parent, const std::string &)
 			case (CRCInput::RC_ok):
 				{
 					if(hasItem() && selected > -1 && (int)items.size() > selected) {
+						//NI lcd4l-support
+						LCD4l->RemoveFile("/tmp/lcd/menu");
+
 						//exec this item...
 						CMenuItem* item = items[selected];
 						if (!item->isSelectable())
@@ -945,6 +954,11 @@ int CMenuWidget::exec(CMenuTarget* parent, const std::string &)
 						item->msg = msg;
 						fader.StopFade();
 						int rv = item->exec( this );
+
+						//NI lcd4l-support
+						if (g_settings.lcd4l_support)
+							LCD4l->CreateFile("/tmp/lcd/menu", item->lcd4l_text, g_settings.lcd4l_convert);
+
 						switch ( rv ) {
 							case menu_return::RETURN_EXIT_ALL:
 								retval = menu_return::RETURN_EXIT_ALL;
diff --git a/src/gui/widget/menue.h b/src/gui/widget/menue.h
index ff4f3e008..84ba02510 100644
--- a/src/gui/widget/menue.h
+++ b/src/gui/widget/menue.h
@@ -197,6 +197,9 @@ class CMenuItem : public  CComponentsSignals
 		void activateNotify(void);
 		virtual void disableByCondition(const menu_item_disable_cond_t& condition);
 		void setParentWidget(CMenuWidget* parent){parent_widget = parent;}
+
+		//NI lcd4l-support
+		std::string lcd4l_text;
 };
 
 class CMenuSeparator : public CMenuItem