summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mageia.org>2012-09-05 17:29:12 +0000
committerThierry Vignaud <tv@mageia.org>2012-09-05 17:29:12 +0000
commit4cead5b9f88242e35148852adf7dc88004becf97 (patch)
treedb70aa11b43e595400b8f9661f56c64275092e14
parent2dbc3cdcb210fc5004ac61d192ec1adc86fff910 (diff)
downloaddrakx-net-4cead5b9f88242e35148852adf7dc88004becf97.tar
drakx-net-4cead5b9f88242e35148852adf7dc88004becf97.tar.gz
drakx-net-4cead5b9f88242e35148852adf7dc88004becf97.tar.bz2
drakx-net-4cead5b9f88242e35148852adf7dc88004becf97.tar.xz
drakx-net-4cead5b9f88242e35148852adf7dc88004becf97.zip
(reload_net_applet) fix crash when net_applet doesn't run (mga#6040)
(backported from trunk)
-rw-r--r--NEWS1
-rw-r--r--lib/network/network.pm2
2 files changed, 2 insertions, 1 deletions
diff --git a/NEWS b/NEWS
index 20ba17d..5422b10 100644
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,5 @@
- drakinvictus: fix crashing due to missing icon (mga#5223)
+- draknetcenter: fix crash when net_applet doesn't run (mga#6040)
- drakroam: fix a crash (mga#6847)
- install rtlwifi-firmware for r8712u driver (#6064)
- wait for network to show up the same way as in the installer
diff --git a/lib/network/network.pm b/lib/network/network.pm
index ccc3ec9..2e0ee40 100644
--- a/lib/network/network.pm
+++ b/lib/network/network.pm
@@ -802,7 +802,7 @@ sub easy_dhcp {
sub reload_net_applet() {
#- make net_applet reload the configuration
my $pid = chomp_(`pidof -x net_applet`);
- $pid and kill 1, $pid;
+ $pid and eval { kill 1, $pid };
}
sub configure_network {