From: Adam Sutton <dev@adamsutton.me.uk>
Date: Wed, 9 Jan 2013 11:01:31 +0000 (+0000)
Subject: main: restore original signal handling removed in error.
X-Git-Tag: v3.5~156
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=82ac35c078aeb0a33bebb7c9c7f60e2926df6a6f;p=thirdparty%2Ftvheadend.git

main: restore original signal handling removed in error.
---

diff --git a/src/main.c b/src/main.c
index e86f38423..710e736c6 100644
--- a/src/main.c
+++ b/src/main.c
@@ -490,6 +490,8 @@ main(int argc, char **argv)
     tvheadend_webroot = tmp;
   }
 
+  signal(SIGPIPE, handle_sigpipe); // will be redundant later
+
   /* Daemonise */
   if(opt_fork) {
     const char *homedir;
@@ -561,7 +563,8 @@ main(int argc, char **argv)
   time(&dispatch_clock);
 
   /* Signal handling */
-  signal(SIGPIPE, handle_sigpipe);
+  sigfillset(&set);
+  sigprocmask(SIG_BLOCK, &set, NULL);
   trap_init(argv[0]);
   
   /**