diff options
| author | ghost <andreas.monzner@multimedia-labs.de> | 2011-01-25 19:15:51 +0100 |
|---|---|---|
| committer | ghost <andreas.monzner@multimedia-labs.de> | 2011-01-25 19:15:51 +0100 |
| commit | b306f065ed4804026e03eb11099ec5c2269cd7cc (patch) | |
| tree | 47c081dbad8a5092a4c904575659f6cf835a3c9d /lib | |
| parent | b3a41d26169d1867be084a868d86d72c8f2d6af9 (diff) | |
| parent | ad4c850143eee2e993d1637a12d9418279ac32d3 (diff) | |
| download | enigma2-b306f065ed4804026e03eb11099ec5c2269cd7cc.tar.gz enigma2-b306f065ed4804026e03eb11099ec5c2269cd7cc.zip | |
Merge branch 'bug_668_segfault_on_e2_restart_with_running_record_timer' into experimental
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/dvb/epgcache.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/dvb/epgcache.cpp b/lib/dvb/epgcache.cpp index ed31903c..4d324746 100644 --- a/lib/dvb/epgcache.cpp +++ b/lib/dvb/epgcache.cpp @@ -366,6 +366,8 @@ void eEPGCache::DVBChannelRunning(iDVBChannel *chan) messages.send(Message(Message::startChannel, chan)); // -> gotMessage -> changedService } + else + data.state=-1; } } } @@ -1187,7 +1189,7 @@ void eEPGCache::save() eEPGCache::channel_data::channel_data(eEPGCache *ml) :cache(ml) - ,abortTimer(eTimer::create(ml)), zapTimer(eTimer::create(ml)), state(-1) + ,abortTimer(eTimer::create(ml)), zapTimer(eTimer::create(ml)), state(-2) ,isRunning(0), haveData(0) #ifdef ENABLE_PRIVATE_EPG ,startPrivateTimer(eTimer::create(ml)) |