From d980ca65823a1c2df1809fc8ecb60b791ebb960f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20G=C3=BCnther?= <tom@toms-cafe.de>
Date: Sun, 20 Jun 2010 23:22:35 +0200
Subject: Fixed crash when deleting ongoing timers or their recordings (closes
 #306)

---
 HISTORY  | 1 +
 status.c | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/HISTORY b/HISTORY
index 461ae26..42d9227 100644
--- a/HISTORY
+++ b/HISTORY
@@ -8,6 +8,7 @@ ____-__-__: Version 1.3.1
 - Fixed segmentation fault with 16bit images (closes #258 - thanks to
   domml@vdrportal)
 - Fixed crash with GraphicsMagick >= 1.3.8 and non-XPM images.
+- Fixed crash when deleting ongoing timers or their recordings (closes #306)
 
 2009-10-06: Version 1.3
 
diff --git a/status.c b/status.c
index e59764e..b8cf1eb 100644
--- a/status.c
+++ b/status.c
@@ -401,6 +401,8 @@ cxType cText2SkinStatus::GetTokenData(const txToken &Token)
 		} else if (mRecordings.size() > 0) {
 			mRecordingsLock.Lock();
 			uint now = cTimeMs::Now();
+			if (mCurrentRecording >= mRecordings.size())
+				mCurrentRecording = mNextRecording = 0;
 			if (mNextRecording == 0)
 				mNextRecording = now + 2000;
 			else if (now >= mNextRecording) {
-- 
cgit v1.2.3