CMenuForwarder: Fix options handling

Origin commit data
------------------
Branch: ni/coolstream
Commit: 08130328a0
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2014-01-30 (Thu, 30 Jan 2014)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
This commit is contained in:
Michael Liebmann
2014-01-30 05:46:48 +01:00
committed by Jacek Jendrzej
parent b6b67e2d5e
commit 6e440ebc11
2 changed files with 28 additions and 12 deletions

View File

@@ -217,8 +217,8 @@ class CMenuForwarder : public CMenuItem
std::string actionKey;
protected:
std::string option_string;
const std::string * option_string_ptr;
const char * option;
const std::string * option_string;
CMenuTarget * jumpTarget;
virtual std::string getOption(void);
@@ -250,6 +250,7 @@ class CMenuForwarder : public CMenuItem
int exec(CMenuTarget* parent);
bool isSelectable(void) const { return active; }
void setOption(const std::string &Option);
void setOption(const char * const Option);
void setName(const std::string& text);
void setName(const neutrino_locale_t text);
};