mirror of
https://github.com/VDR4Arch/vdr.git
synced 2023-10-10 13:36:52 +02:00
Fixed a crash when starting "Pause live video" twice within the same minute on the same channel
This commit is contained in:
parent
57a95c6790
commit
2e9ef13f1c
2
HISTORY
2
HISTORY
@ -2302,3 +2302,5 @@ Video Disk Recorder Revision History
|
|||||||
mode (thanks to Rainer Zocholl for reporting this one).
|
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
|
- 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).
|
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.
|
||||||
|
4
menu.c
4
menu.c
@ -4,7 +4,7 @@
|
|||||||
* See the main source file 'vdr.c' for copyright information and
|
* See the main source file 'vdr.c' for copyright information and
|
||||||
* how to reach the author.
|
* 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"
|
#include "menu.h"
|
||||||
@ -3001,6 +3001,8 @@ cRecordControl::cRecordControl(cDevice *Device, cTimer *Timer, bool Pause)
|
|||||||
else {
|
else {
|
||||||
Timers.Del(timer);
|
Timers.Del(timer);
|
||||||
Timers.Save();
|
Timers.Save();
|
||||||
|
if (!cReplayControl::LastReplayed()) // an instant recording, maybe from cRecordControls::PauseLiveVideo()
|
||||||
|
cReplayControl::SetRecording(fileName, Recording.Name());
|
||||||
}
|
}
|
||||||
timer = NULL;
|
timer = NULL;
|
||||||
return;
|
return;
|
||||||
|
Loading…
Reference in New Issue
Block a user