1
0
mirror of https://github.com/VDR4Arch/vdr.git synced 2023-10-10 13:36:52 +02:00

Fixed a crash when closing down with remote control plugins

This commit is contained in:
Klaus Schmidinger 2002-10-12 15:22:29 +02:00
parent ec5795bda2
commit fadc2565d4
4 changed files with 8 additions and 5 deletions

View File

@ -415,6 +415,7 @@ Oliver Endriss <o.endriss@gmx.de>
for helping to test and debug the new channel source and DiSEqC handling for helping to test and debug the new channel source and DiSEqC handling
for reporting a bug when pressing the "Blue" button in the main menu without for reporting a bug when pressing the "Blue" button in the main menu without
having displayed it having displayed it
for helping to debug a crash when closing down with remote control plugins
Reinhard Walter Buchner <rw.buchner@freenet.de> Reinhard Walter Buchner <rw.buchner@freenet.de>
for adding some satellites to 'sources.conf' for adding some satellites to 'sources.conf'

View File

@ -1597,3 +1597,5 @@ Video Disk Recorder Revision History
- Fixed switching the video format in the Setup/DVB menu (thanks to Uwe Scheffler - Fixed switching the video format in the Setup/DVB menu (thanks to Uwe Scheffler
for reporting this one). for reporting this one).
- Reactivated full handling of second audio PID (even in 'Transfer Mode'). - Reactivated full handling of second audio PID (even in 'Transfer Mode').
- Fixed a crash when closing down with remote control plugins (thanks to Oliver
Endriss helping to debug this one).

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: remote.c 1.28 2002/09/29 12:51:26 kls Exp $ * $Id: remote.c 1.29 2002/10/12 15:22:08 kls Exp $
*/ */
#include "remote.h" #include "remote.h"
@ -34,8 +34,7 @@ cCondVar cRemote::keyPressed;
cRemote::cRemote(const char *Name) cRemote::cRemote(const char *Name)
{ {
if (Name) name = Name ? strdup(Name) : NULL;
name = strdup(Name);
Remotes.Add(this); Remotes.Add(this);
} }

5
vdr.c
View File

@ -22,7 +22,7 @@
* *
* The project's page is at http://www.cadsoft.de/people/kls/vdr * The project's page is at http://www.cadsoft.de/people/kls/vdr
* *
* $Id: vdr.c 1.125 2002/10/06 10:25:04 kls Exp $ * $Id: vdr.c 1.126 2002/10/12 15:22:29 kls Exp $
*/ */
#include <getopt.h> #include <getopt.h>
@ -634,11 +634,12 @@ int main(int argc, char *argv[])
cControl::Shutdown(); cControl::Shutdown();
delete Interface; delete Interface;
cOsd::Shutdown(); cOsd::Shutdown();
PluginManager.Shutdown(true); Remotes.Clear();
Setup.CurrentChannel = cDevice::CurrentChannel(); Setup.CurrentChannel = cDevice::CurrentChannel();
Setup.CurrentVolume = cDevice::CurrentVolume(); Setup.CurrentVolume = cDevice::CurrentVolume();
Setup.Save(); Setup.Save();
cDevice::Shutdown(); cDevice::Shutdown();
PluginManager.Shutdown(true);
if (WatchdogTimeout > 0) if (WatchdogTimeout > 0)
dsyslog("max. latency time %d seconds", MaxLatencyTime); dsyslog("max. latency time %d seconds", MaxLatencyTime);
isyslog("exiting"); isyslog("exiting");