Merge branch 'master' of projects.vdr-developer.org:vdr-plugin-pvrinput

2 files changed, 2 insertions, 2 deletions

diff --git a/device.c b/device.c
index 94d359a..20b4718 100644
--- a/device.c
+++ b/device.c
@@ -90,7 +90,7 @@ cPvrDevice::cPvrDevice(int DeviceNumber)
       This was fixed in v4l-dvb hg in 01/2009 and will hopefully be in Kernel 2.6.30*/
     SupportsSlicedVBI = true;
     VBIDeviceCount++;
-    log(pvrDEBUG1, "%s supports sliced VBI Capture, total number of VBI capable devices is now &d", *devName, VBIDeviceCount);
+    log(pvrDEBUG1, "%s supports sliced VBI Capture, total number of VBI capable devices is now %d", *devName, VBIDeviceCount);
     }
   if (video_vcap.capabilities & V4L2_CAP_VIDEO_OUTPUT_OVERLAY)
      hasDecoder = true; //can only be a PVR350
diff --git a/reader.c b/reader.c
index cdd03fd..2d15a5e 100644
--- a/reader.c
+++ b/reader.c
@@ -517,7 +517,7 @@ void cPvrReadThread::Action(void)
       memcpy(pmt_buffer, kPMTRadio, TS_SIZE);
       crc_offset = 28;
       }
-    else if (cPvrDevice::VBIDeviceCount > 0) {
+    else if ((PvrSetup.SliceVBI != 0) && (cPvrDevice::VBIDeviceCount > 0)) {
       memcpy(pmt_buffer, kPMTwithTeletext, TS_SIZE);
       crc_offset = 40;
       }