mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-08-29 08:21:07 +02:00
Code Issues Packages Projects Releases Wiki Activity

CTimerList: Fix displaying and saving reminder timer

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: b2446667e9
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2014-02-12 (Wed, 12 Feb 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-02-12 05:46:04 +01:00
parent 4abf2a80f8
commit 50e9193d74
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/gui/timerlist.cpp
View File

@@ -261,6 +261,7 @@ CTimerList::CTimerList()
listmaxshow = 0; listmaxshow = 0;
Timer = new CTimerdClient(); Timer = new CTimerdClient();
skipEventID=0; skipEventID=0;
timerNew_message = "";
/* most probable default */ /* most probable default */
saved_dispmode = (int)CVFD::MODE_TVRADIO; saved_dispmode = (int)CVFD::MODE_TVRADIO;
@@ -338,7 +339,7 @@ int CTimerList::exec(CMenuTarget* parent, const std::string & actionKey)
data= &eventinfo; data= &eventinfo;
} }
else if (timerNew.eventType==CTimerd::TIMER_REMIND) else if (timerNew.eventType==CTimerd::TIMER_REMIND)
data= timerNew.message; data = (void*)timerNew_message.c_str();
else if (timerNew.eventType==CTimerd::TIMER_EXEC_PLUGIN) else if (timerNew.eventType==CTimerd::TIMER_EXEC_PLUGIN)
{ {
if (strcmp(timerNew.pluginName, "---") == 0) if (strcmp(timerNew.pluginName, "---") == 0)
@@ -1218,9 +1219,9 @@ int CTimerList::newTimer()
CMenuOptionChooser* m8 = new CMenuOptionChooser(LOCALE_TIMERLIST_STANDBY, &timerNew_standby_on, TIMERLIST_STANDBY_OPTIONS, TIMERLIST_STANDBY_OPTION_COUNT, false); CMenuOptionChooser* m8 = new CMenuOptionChooser(LOCALE_TIMERLIST_STANDBY, &timerNew_standby_on, TIMERLIST_STANDBY_OPTIONS, TIMERLIST_STANDBY_OPTION_COUNT, false);
std::string timerNew_message(timerNew.message); timerNew_message = std::string(timerNew.message);
CStringInputSMS timerSettings_msg(LOCALE_TIMERLIST_MESSAGE, &timerNew_message, 30, NONEXISTANT_LOCALE, NONEXISTANT_LOCALE, "abcdefghijklmnopqrstuvwxyz0123456789-.,:!?/ "); 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 ); CMenuForwarder *m9 = new CMenuForwarder(LOCALE_TIMERLIST_MESSAGE, false, timerNew_message, &timerSettings_msg );
strcpy(timerNew.pluginName,"---"); strcpy(timerNew.pluginName,"---");
CPluginChooser plugin_chooser(LOCALE_TIMERLIST_PLUGIN, CPlugins::P_TYPE_SCRIPT | CPlugins::P_TYPE_TOOL CPluginChooser plugin_chooser(LOCALE_TIMERLIST_PLUGIN, CPlugins::P_TYPE_SCRIPT | CPlugins::P_TYPE_TOOL

1
src/gui/timerlist.h
View File

@@ -65,6 +65,7 @@ class CTimerList : public CMenuTarget
int timerNew_standby_on; int timerNew_standby_on;
std::string timerNew_channel_name; std::string timerNew_channel_name;
std::string m_weekdaysStr; std::string m_weekdaysStr;
std::string timerNew_message;
int timer_apids_dflt; int timer_apids_dflt;
int timer_apids_std; int timer_apids_std;