From 53aea17949a184d264bfd98c8e669b94997bfc79 Mon Sep 17 00:00:00 2001 From: Klaus Schmidinger Date: Sat, 24 Mar 2018 09:58:03 +0100 Subject: Fixed a possible discrepancy of the primary device number in the LSTD and PRIM commands --- CONTRIBUTORS | 2 ++ HISTORY | 5 ++++- device.c | 3 ++- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/CONTRIBUTORS b/CONTRIBUTORS index 1954bbdd..5125b57b 100644 --- a/CONTRIBUTORS +++ b/CONTRIBUTORS @@ -2265,6 +2265,8 @@ Javier Fern Jürgen Schneider for a patch that was used as a base to fix handling multi byte key sequences in cKbdRemote + for reporting a possible discrepancy of the primary device number in the LSTD and + PRIM commands Christian Wieninger for suggesting to add cMenuEditStrItem::InEditMode() diff --git a/HISTORY b/HISTORY index e206d153..b056690d 100644 --- a/HISTORY +++ b/HISTORY @@ -9317,7 +9317,7 @@ Video Disk Recorder Revision History - Modified cMenuTimers::Delete() to avoid a lengthy lock on the Timers list while prompting the user. -2018-03-23: Version 2.4.0 +2018-03-24: Version 2.4.0 - Updated the Ukrainian OSD texts (thanks to Yarema Aka Knedlyk). - Fixed processing SVDRP client responses in case the caller doesn't want the actual @@ -9326,3 +9326,6 @@ Video Disk Recorder Revision History some error. - Fixed some warnings from g++ 7.2.0 regarding fixed buffer sizes in cMenuEditTimeItem::Set() and cCountdown::Update() (reported by Jörg Wendel). +- Fixed a possible discrepancy of the primary device number in the LSTD and PRIM + commands, by setting Setup.PrimaryDVB in cDevice::SetPrimaryDevice() (reported by + Jürgen Schneider). diff --git a/device.c b/device.c index a8cb0b55..626495dc 100644 --- a/device.c +++ b/device.c @@ -4,7 +4,7 @@ * See the main source file 'vdr.c' for copyright information and * how to reach the author. * - * $Id: device.c 4.26 2018/01/27 14:45:08 kls Exp $ + * $Id: device.c 4.27 2018/03/24 09:49:14 kls Exp $ */ #include "device.h" @@ -195,6 +195,7 @@ bool cDevice::SetPrimaryDevice(int n) primaryDevice->MakePrimaryDevice(true); primaryDevice->SetVideoFormat(Setup.VideoFormat); primaryDevice->SetVolumeDevice(Setup.CurrentVolume); + Setup.PrimaryDVB = n + 1; return true; } esyslog("ERROR: invalid primary device number: %d", n + 1); -- cgit v1.2.3