summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--HISTORY2
-rw-r--r--menu.c4
2 files changed, 5 insertions, 1 deletions
diff --git a/HISTORY b/HISTORY
index 873344c8..794a532c 100644
--- a/HISTORY
+++ b/HISTORY
@@ -2302,3 +2302,5 @@ Video Disk Recorder Revision History
mode (thanks to Rainer Zocholl for reporting this one).
- VDR now stops with exit status 2 if one of the configuration files can't be
read correctly at program startup (suggested by Rainer Zocholl).
+- Fixed a crash when starting "Pause live video" twice within the same minute on
+ the same channel.
diff --git a/menu.c b/menu.c
index 6dcb2362..87afabd2 100644
--- a/menu.c
+++ b/menu.c
@@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and
* how to reach the author.
*
- * $Id: menu.c 1.265 2003/08/09 10:14:44 kls Exp $
+ * $Id: menu.c 1.266 2003/08/16 10:17:49 kls Exp $
*/
#include "menu.h"
@@ -3001,6 +3001,8 @@ cRecordControl::cRecordControl(cDevice *Device, cTimer *Timer, bool Pause)
else {
Timers.Del(timer);
Timers.Save();
+ if (!cReplayControl::LastReplayed()) // an instant recording, maybe from cRecordControls::PauseLiveVideo()
+ cReplayControl::SetRecording(fileName, Recording.Name());
}
timer = NULL;
return;