From 8e6a3f840cf1e9141942e93c757e1bc21732c91e Mon Sep 17 00:00:00 2001
From: Thierry Vignaud <thierry.vignaud@gmail.com>
Date: Wed, 8 Jan 2014 04:42:00 +0100
Subject: delay setting SIG_CHLD handler (mga#11492)

thus fixing segfault on startup

Conflicts:
	NEWS
---
 NEWS      | 3 +++
 mgaapplet | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/NEWS b/NEWS
index 5e09b10a..a8f4bc66 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,6 @@
+- delay setting SIG_CHLD handler
+  (thus fixing segfault on startup (mga#11492))
+
 Version 2.81 - 15 May 2013, Colin Guthrie
 
 - ensure nonfree/tainted media is kept enabled on distro upgrade
diff --git a/mgaapplet b/mgaapplet
index 0f82b094..cd5636e4 100755
--- a/mgaapplet
+++ b/mgaapplet
@@ -243,6 +243,7 @@ shouldStart() or die "$localfile should be set to TRUE: please use --force or -f
 go2State('delayed');
 
 Glib::Timeout->add_seconds($config{FIRST_CHECK_DELAY}/1000, sub {
+                       $SIG{CHLD} = \&harvester;
                        # schedule future checks:
                        setup_cyclic_check();
                        # perform a test after initial delay:
@@ -254,7 +255,6 @@ Glib::Timeout->add_seconds($config{FIRST_CHECK_DELAY}/1000, sub {
 
 $SIG{USR1} = 'IGNORE';
 $SIG{USR2} = 'IGNORE';
-$SIG{CHLD} = \&harvester;
 $SIG{HUP} = \&restart_applet;
 
 run_program::raw({ detach => 1 }, 'ionice', '-p', $$, '-n7');
-- 
cgit v1.2.1