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

Merge remote-tracking branch 'uncool/cst-next'

Browse Source 
This need buildfixes and some functional updates...


Origin commit data
------------------
Branch: ni/coolstream
Commit: eeee5bacab
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2015-12-13 (Sun, 13 Dec 2015)



------------------
This commit was generated by Migit
This commit is contained in:
Stefan Seyfried
2015-12-13 17:41:55 +01:00
parent 61712bcdf2 151d7f25a4
commit 5f89c9a312
320 changed files with 21291 additions and 13199 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/timerd/timermanager.cpp
View File

@@ -438,8 +438,7 @@ void CTimerManager::loadEventsFromConfig()
}
else
{
std::vector<int> savedIDs;
savedIDs = config.getInt32Vector ("IDS");
std::vector<int> savedIDs = config.getInt32Vector("IDS");
dprintf("%d timer(s) in config\n", (int)savedIDs.size());
for(unsigned int i=0; i < savedIDs.size(); i++)
{
@@ -1019,19 +1018,11 @@ void CTimerEvent::printEvent(void)
void CTimerEvent::saveToConfig(CConfigFile *config)
{
dprintf("CTimerEvent::saveToConfig\n");
std::vector<int> allIDs;
allIDs.clear();
if (!(config->getString("IDS").empty()))
{
// sonst bekommen wir den bloeden 0er
allIDs=config->getInt32Vector("IDS");
}
std::vector<int> allIDs = config->getInt32Vector("IDS");
allIDs.push_back(eventID);
dprintf("adding %d to IDS\n",eventID);
//SetInt-Vector haengt komischerweise nur an, deswegen erst loeschen
config->setString("IDS","");
config->setInt32Vector ("IDS",allIDs);
dprintf("adding %d to IDS\n", eventID);
config->setInt32Vector("IDS", allIDs);
std::stringstream ostr;
ostr << eventID;