summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKlaus Schmidinger <vdr@tvdr.de>2001-01-07 17:05:35 +0100
committerKlaus Schmidinger <vdr@tvdr.de>2001-01-07 17:05:35 +0100
commit76d2cd9f4be6f5db824a101ffd02fcac70665175 (patch)
treea34fd9d7fc609b522a0a52e338ae5b33ffc16943
parent7c79f61dd53bb1de38e5bb82161de4600b963358 (diff)
downloadvdr-76d2cd9f4be6f5db824a101ffd02fcac70665175.tar.gz
vdr-76d2cd9f4be6f5db824a101ffd02fcac70665175.tar.bz2
Fixed starting replay while in transfer mode
-rw-r--r--HISTORY2
-rw-r--r--dvbapi.c10
2 files changed, 7 insertions, 5 deletions
diff --git a/HISTORY b/HISTORY
index 40b37277..503e4190 100644
--- a/HISTORY
+++ b/HISTORY
@@ -332,3 +332,5 @@ Video Disk Recorder Revision History
- Implemented "On Disk Editing".
- There is no more default 'timers.conf' file.
- Added Italian language texts (thanks to Alberto Carraro).
+- Fixed starting a replay session when the program is currently in "transfer
+ mode".
diff --git a/dvbapi.c b/dvbapi.c
index c85532f8..73c8ad49 100644
--- a/dvbapi.c
+++ b/dvbapi.c
@@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and
* how to reach the author.
*
- * $Id: dvbapi.c 1.45 2001/01/07 17:00:50 kls Exp $
+ * $Id: dvbapi.c 1.46 2001/01/07 17:02:38 kls Exp $
*/
#include "dvbapi.h"
@@ -2164,10 +2164,6 @@ bool cDvbApi::SetChannel(int ChannelNumber, int FrequencyMHz, char Polarization,
{
if (videoDev >= 0) {
StopTransfer();
- if (transferringFromDvbApi) {
- transferringFromDvbApi->StopTransfer();
- transferringFromDvbApi = NULL;
- }
SetPlayMode(videoDev, VID_PLAY_RESET);
struct frontend front;
ioctl(videoDev, VIDIOCGFRONTEND, &front);
@@ -2229,6 +2225,10 @@ void cDvbApi::StopTransfer(void)
transferBuffer = NULL;
SetPlayMode(videoDev, VID_PLAY_RESET);
}
+ if (transferringFromDvbApi) {
+ transferringFromDvbApi->StopTransfer();
+ transferringFromDvbApi = NULL;
+ }
}
int cDvbApi::SecondsToFrames(int Seconds)