diff options
| author | Klaus Schmidinger <vdr@tvdr.de> | 2005-01-25 18:22:46 +0100 |
|---|---|---|
| committer | Klaus Schmidinger <vdr@tvdr.de> | 2005-01-25 18:22:46 +0100 |
| commit | ac60bd7141b141ca1b4ee11b2471ccb24688a068 (patch) | |
| tree | 96e86c273dc295d96d25072b141ed71e4f1ac93d | |
| parent | c7211d13bee617e8126e627d198121b9fbe78adf (diff) | |
| download | vdr-ac60bd7141b141ca1b4ee11b2471ccb24688a068.tar.gz vdr-ac60bd7141b141ca1b4ee11b2471ccb24688a068.tar.bz2 | |
Now setting primaryDevice = NULL before deleting the devices in cDevice::Shutdown()
| -rw-r--r-- | CONTRIBUTORS | 4 | ||||
| -rw-r--r-- | HISTORY | 5 | ||||
| -rw-r--r-- | device.c | 4 |
3 files changed, 10 insertions, 3 deletions
diff --git a/CONTRIBUTORS b/CONTRIBUTORS index 341fa9d7..14f3b012 100644 --- a/CONTRIBUTORS +++ b/CONTRIBUTORS @@ -1233,3 +1233,7 @@ Walter Koch <koch@u32.de> Rolf Groppe <rolf@groppe.de> for suggesting to fall back to 'stereo' when switching channels in case the user 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() @@ -3333,8 +3333,11 @@ Video Disk Recorder Revision History - Added PlayPes(NULL, 0) to cTransfer::Action() when clearing the transfer buffer 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 in case there is only one audio track (thanks to Sascha Volkenandt for reporting 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,7 +4,7 @@ * See the main source file 'vdr.c' for copyright information and * 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" @@ -281,11 +281,11 @@ cDevice *cDevice::GetDevice(const cChannel *Channel, int Priority, bool *NeedsDe void cDevice::Shutdown(void) { + primaryDevice = NULL; for (int i = 0; i < numDevices; i++) { delete device[i]; device[i] = NULL; } - primaryDevice = NULL; } bool cDevice::GrabImage(const char *FileName, bool Jpeg, int Quality, int SizeX, int SizeY) |