git.cweiske.de
/
enigma2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of fraxinas@git.opendreambox.org:/git/enigma2
[enigma2.git]
/
lib
/
dvb
/
dvbtime.cpp
diff --git
a/lib/dvb/dvbtime.cpp
b/lib/dvb/dvbtime.cpp
index 4c5911c9178ce8da1356ea5fd125ee8acf6d76ad..c43357959b16165052d86f71acdc3b378aacf45d 100644
(file)
--- a/
lib/dvb/dvbtime.cpp
+++ b/
lib/dvb/dvbtime.cpp
@@
-169,8
+169,6
@@
eDVBLocalTimeHandler::eDVBLocalTimeHandler()
eDVBLocalTimeHandler::~eDVBLocalTimeHandler()
{
instance=0;
eDVBLocalTimeHandler::~eDVBLocalTimeHandler()
{
instance=0;
- for (std::map<iDVBChannel*, channel_data>::iterator it=m_knownChannels.begin(); it != m_knownChannels.end(); ++it)
- delete it->second.tdt;
if (ready())
{
eDebug("set RTC to previous valid time");
if (ready())
{
eDebug("set RTC to previous valid time");
@@
-396,10
+394,10
@@
void eDVBLocalTimeHandler::updateTime( time_t tp_time, eDVBChannel *chan, int up
m_knownChannels.find(chan);
if ( it != m_knownChannels.end() )
{
m_knownChannels.find(chan);
if ( it != m_knownChannels.end() )
{
- TDT *prev_tdt = it->second.tdt;
- it->second.tdt = new TDT(chan, prev_tdt->getUpdateCount());
+ int updateCount = it->second.tdt->getUpdateCount();
+ it->second.tdt = 0;
+ it->second.tdt = new TDT(chan, updateCount);
it->second.tdt->startTimer(60*60*1000); // restart TDT for this transponder in 60min
it->second.tdt->startTimer(60*60*1000); // restart TDT for this transponder in 60min
- delete prev_tdt;
}
}
}
}
}
}
@@
-437,7
+435,6
@@
void eDVBLocalTimeHandler::DVBChannelStateChanged(iDVBChannel *chan)
break;
case iDVBChannel::state_release:
eDebug("[eDVBLocalTimerHandler] remove channel %p", chan);
break;
case iDVBChannel::state_release:
eDebug("[eDVBLocalTimerHandler] remove channel %p", chan);
- delete it->second.tdt;
m_knownChannels.erase(it);
break;
default: // ignore all other events
m_knownChannels.erase(it);
break;
default: // ignore all other events