frodovdr
/
vdr
mirror of https://github.com/VDR4Arch/vdr.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Now setting primaryDevice = NULL before deleting the devices in cDevice::Shutdown()

This commit is contained in:
Klaus Schmidinger 2005-01-25 18:22:46 +01:00
parent c7211d13be
commit ac60bd7141
3 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CONTRIBUTORS
View File

@ -1233,3 +1233,7 @@ Walter Koch <koch@u32.de>
Rolf Groppe <rolf@groppe.de> Rolf Groppe <rolf@groppe.de>
for suggesting to fall back to 'stereo' when switching channels in case the user for suggesting to fall back to 'stereo' when switching channels in case the user
had switched to 'left' or 'right' had switched to 'left' or 'right'
Wolfgang Rohdewald <wolfgang@rohdewald.de>
for pointing out that primaryDevice = NULL should be done before deleting the devices
in cDevice::Shutdown()

5
HISTORY
View File

@ -3333,8 +3333,11 @@ Video Disk Recorder Revision History
- Added PlayPes(NULL, 0) to cTransfer::Action() when clearing the transfer buffer - Added PlayPes(NULL, 0) to cTransfer::Action() when clearing the transfer buffer
to avoid overflows (thanks to Marco Schlüßler for pointing this out). to avoid overflows (thanks to Marco Schlüßler for pointing this out).
2005-01-23: Version 1.3.20 2005-01-25: Version 1.3.20
- Fixed displaying the "Audio" menu with the "Green" button from the "Main" menu - Fixed displaying the "Audio" menu with the "Green" button from the "Main" menu
in case there is only one audio track (thanks to Sascha Volkenandt for reporting in case there is only one audio track (thanks to Sascha Volkenandt for reporting
this one). this one).
- Now setting primaryDevice = NULL before deleting the devices in cDevice::Shutdown()
to avoid problems in case other threads access it (thanks to Wolfgang Rohdewald for
pointing this out).

4
device.c
View File

@ -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: device.c 1.78 2005/01/23 14:15:00 kls Exp $ * $Id: device.c 1.79 2005/01/25 18:19:30 kls Exp $
*/ */
#include "device.h" #include "device.h"
@ -281,11 +281,11 @@ cDevice *cDevice::GetDevice(const cChannel *Channel, int Priority, bool *NeedsDe
void cDevice::Shutdown(void) void cDevice::Shutdown(void)
{ {
primaryDevice = NULL;
for (int i = 0; i < numDevices; i++) { for (int i = 0; i < numDevices; i++) {
delete device[i]; delete device[i];
device[i] = NULL; device[i] = NULL;
} }
primaryDevice = NULL;
} }
bool cDevice::GrabImage(const char *FileName, bool Jpeg, int Quality, int SizeX, int SizeY) bool cDevice::GrabImage(const char *FileName, bool Jpeg, int Quality, int SizeX, int SizeY)