mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-28 16:01:20 +02:00
Code Issues Packages Projects Releases Wiki Activity

CTimerList: Fix eventType CTimerd::TIMER_EXEC_PLUGIN

Browse Source
This commit is contained in:
M. Liebmann
2014-03-04 07:07:45 +01:00
parent d1b8246316
commit 8505e1c6d7
2 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/gui/timerlist.cpp
View File

@@ -263,6 +263,7 @@ CTimerList::CTimerList()
Timer = new CTimerdClient();
skipEventID=0;
timerNew_message = "";
timerNew_pluginName = "";
/* most probable default */
saved_dispmode = (int)CVFD::MODE_TVRADIO;
@@ -343,9 +344,9 @@ int CTimerList::exec(CMenuTarget* parent, const std::string & actionKey)
data = (void*)timerNew_message.c_str();
else if (timerNew.eventType==CTimerd::TIMER_EXEC_PLUGIN)
{
if (strcmp(timerNew.pluginName, "---") == 0)
if (timerNew_pluginName == "---")
return menu_return::RETURN_REPAINT;
data= timerNew.pluginName;
data = (void*)timerNew_pluginName.c_str();
}
if (timerNew.eventRepeat >= CTimerd::TIMERREPEAT_WEEKDAYS)
Timer->getWeekdaysFromStr(&timerNew.eventRepeat, m_weekdaysStr);
@@ -1224,13 +1225,13 @@ int CTimerList::newTimer()
CStringInputSMS timerSettings_msg(LOCALE_TIMERLIST_MESSAGE, &timerNew_message, 30, NONEXISTANT_LOCALE, NONEXISTANT_LOCALE, "abcdefghijklmnopqrstuvwxyz0123456789-.,:!?/ ");
CMenuForwarder *m9 = new CMenuForwarder(LOCALE_TIMERLIST_MESSAGE, false, timerNew_message, &timerSettings_msg );
std::string timerNew_pluginName("---");
timerNew_pluginName = "---";
CPluginChooser plugin_chooser(LOCALE_TIMERLIST_PLUGIN, CPlugins::P_TYPE_SCRIPT | CPlugins::P_TYPE_TOOL
#if ENABLE_LUA
| CPlugins::P_TYPE_LUA
#endif
, timerNew_pluginName);
CMenuForwarder *m10 = new CMenuForwarder(LOCALE_TIMERLIST_PLUGIN, false, timerNew.pluginName, &plugin_chooser);
CMenuForwarder *m10 = new CMenuForwarder(LOCALE_TIMERLIST_PLUGIN, false, timerNew_pluginName, &plugin_chooser);
CTimerListNewNotifier notifier2((int *)&timerNew.eventType,