summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <thierry.vignaud@gmail.com>2014-01-08 04:42:00 +0100
committerThierry Vignaud <thierry.vignaud@gmail.com>2014-01-24 06:21:58 +0100
commit8e6a3f840cf1e9141942e93c757e1bc21732c91e (patch)
tree8b9ee48be670a35fc195444cde3e5bbfc839a1fe
parent627ce3718aacf2ede938fc75060f2ed2fd3f978e (diff)
downloadmgaonline-8e6a3f840cf1e9141942e93c757e1bc21732c91e.tar
mgaonline-8e6a3f840cf1e9141942e93c757e1bc21732c91e.tar.gz
mgaonline-8e6a3f840cf1e9141942e93c757e1bc21732c91e.tar.bz2
mgaonline-8e6a3f840cf1e9141942e93c757e1bc21732c91e.tar.xz
mgaonline-8e6a3f840cf1e9141942e93c757e1bc21732c91e.zip
delay setting SIG_CHLD handler (mga#11492)
thus fixing segfault on startup Conflicts: NEWS
-rw-r--r--NEWS3
-rwxr-xr-xmgaapplet2
2 files changed, 4 insertions, 1 deletions
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');