From f99b293de4fd9b901d36420859e0945023bdfea2 Mon Sep 17 00:00:00 2001 From: Klaus Schmidinger Date: Sat, 13 Oct 2007 10:34:30 +0200 Subject: [PATCH] Added a missing SetVolumeDevice() call in cDevice::SetPrimaryDevice() --- CONTRIBUTORS | 1 + HISTORY | 2 ++ device.c | 3 ++- 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/CONTRIBUTORS b/CONTRIBUTORS index 33a1791f..726aed9c 100644 --- a/CONTRIBUTORS +++ b/CONTRIBUTORS @@ -1140,6 +1140,7 @@ Reinhard Nissl for fixing a busy loop in fast forward if the next video data file is missing for adding a debug error message to cReceiver::~cReceiver() in case it is still attached to a device + for reporting a missing SetVolumeDevice() call in cDevice::SetPrimaryDevice() Richard Robson for reporting freezing replay if a timer starts while in Transfer Mode from the diff --git a/HISTORY b/HISTORY index 3dfb45c8..4100e7ae 100644 --- a/HISTORY +++ b/HISTORY @@ -5453,3 +5453,5 @@ Video Disk Recorder Revision History channel in the Channels menu (reported by Halim Sahin). - Fixed a missing '-' at the next to last line of SVDRP help texts (reported by Denis Knauf). +- Added a missing SetVolumeDevice() call in cDevice::SetPrimaryDevice() (reported + by Reinhard Nissl). diff --git a/device.c b/device.c index 89f7f2fd..c4f99259 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 1.143 2007/10/12 14:27:30 kls Exp $ + * $Id: device.c 1.144 2007/10/13 10:30:13 kls Exp $ */ #include "device.h" @@ -326,6 +326,7 @@ bool cDevice::SetPrimaryDevice(int n) primaryDevice = device[n]; primaryDevice->MakePrimaryDevice(true); primaryDevice->SetVideoFormat(Setup.VideoFormat); + primaryDevice->SetVolumeDevice(Setup.CurrentVolume); return true; } esyslog("ERROR: invalid primary device number: %d", n + 1);