From f3c99f7a4456798218f2602010ad106dd822e88f Mon Sep 17 00:00:00 2001 From: Michael Liebmann Date: Tue, 4 Mar 2014 07:07:45 +0100 Subject: [PATCH] CTimerList: Fix eventType CTimerd::TIMER_EXEC_PLUGIN Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/8505e1c6d7a73583775c2188a88d7b89abab29a5 Author: Michael Liebmann Date: 2014-03-04 (Tue, 04 Mar 2014) ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- src/gui/timerlist.cpp | 9 +++++---- src/gui/timerlist.h | 3 ++- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/src/gui/timerlist.cpp b/src/gui/timerlist.cpp index 3aafcd90b..00b4ac109 100644 --- a/src/gui/timerlist.cpp +++ b/src/gui/timerlist.cpp @@ -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, diff --git a/src/gui/timerlist.h b/src/gui/timerlist.h index c05c7f486..137eb6286 100644 --- a/src/gui/timerlist.h +++ b/src/gui/timerlist.h @@ -66,7 +66,8 @@ class CTimerList : public CMenuTarget std::string timerNew_channel_name; std::string m_weekdaysStr; std::string timerNew_message; - + std::string timerNew_pluginName; + int timer_apids_dflt; int timer_apids_std; int timer_apids_ac3;