Fixed a race condition with signal handlers at program exit

3 files changed, 12 insertions, 2 deletions

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index fedb8c1d..1f9c1420 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -1492,6 +1492,7 @@ Udo Richter <udo_richter@gmx.de>
  for implementing cPlugin::WakeupTime() to allow plugins to request VDR to wake
  up at a particular time
  for making the HUP signal force a restart of VDR
+ for fixing a race condition with signal handlers at program exit
 
 Sven Kreiensen <svenk@kammer.uni-hannover.de>
  for his help in keeping 'channels.conf.terr' up to date
diff --git a/HISTORY b/HISTORY
index 91fac882..6e7094d3 100644
--- a/HISTORY
+++ b/HISTORY
@@ -5172,9 +5172,11 @@ Video Disk Recorder Revision History
   (thanks to Reinhard Nissl).
 - Fixed handling frequencies in NitFilter::Process() (thanks to Anssi Hannula).
 
-2007-04-28: Version 1.5.3
+2007-04-30: Version 1.5.3
 
 - Fixed some spelling errors in 'newplugin' (thanks to Ville Skyttä).
 - Fixed a busy loop in fast forward if the next video data file is missing
   (thanks to Reinhard Nissl).
 - Fixed handling frequencies in NitFilter::Process() (thanks to Anssi Hannula).
+- Fixed a race condition with signal handlers at program exit (thanks to Udo
+  Richter).
diff --git a/vdr.c b/vdr.c
index fa5d72bb..c01588fa 100644
--- a/vdr.c
+++ b/vdr.c
@@ -22,7 +22,7 @@
  *
  * The project's page is at http://www.cadsoft.de/vdr
  *
- * $Id: vdr.c 1.287 2007/04/22 13:28:32 kls Exp $
+ * $Id: vdr.c 1.288 2007/04/30 09:22:27 kls Exp $
  */
 
 #include <getopt.h>
@@ -1203,6 +1203,13 @@ int main(int argc, char *argv[])
 
 Exit:
 
+  // Reset all signal handlers to default before Interface gets deleted:
+  signal(SIGHUP,  SIG_DFL);
+  signal(SIGINT,  SIG_DFL);
+  signal(SIGTERM, SIG_DFL);
+  signal(SIGPIPE, SIG_DFL);
+  signal(SIGALRM, SIG_DFL);
+
   PluginManager.StopPlugins();
   cRecordControls::Shutdown();
   cCutter::Stop();