From 3d84feede672609e1c490af4a6d69c14f07ba7fa 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#10289)

thus fixing segfault on startup
---
 NEWS      | 3 +++
 mgaapplet | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/NEWS b/NEWS
index 1b482138..6432847c 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,6 @@
+- delay setting SIG_CHLD handler
+  (thus fixing segfault on startup (mga#10289))
+
 Version 3.4 - 30 December 2013, Thierry Vignaud
 
 - mdkapplet-config (mga#12148)
diff --git a/mgaapplet b/mgaapplet
index 2af525ff..8f928d10 100755
--- a/mgaapplet
+++ b/mgaapplet
@@ -207,6 +207,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:
@@ -218,7 +219,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