From: ghost <andreas.monzner@multimedia-labs.de>
Date: Wed, 9 Feb 2011 14:12:29 +0000 (+0100)
Subject: Merge branch 'bug_668_segfault_on_e2_restart_with_running_record_timer'
X-Git-Tag: experimental-2011.03~6^2~9
X-Git-Url: https://git.cweiske.de/enigma2.git/commitdiff_plain/fa6d60737fd7c0ba429b07d954c1a0f376fe5566?hp=f0fa458aa15610408a16f3214a6e857f16b0c646

Merge branch 'bug_668_segfault_on_e2_restart_with_running_record_timer'
---

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))