summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mageia.org>2012-09-05 17:29:45 +0000
committerThierry Vignaud <tv@mageia.org>2012-09-05 17:29:45 +0000
commit6dd5adef4c680ae041a7b8d1e4d6a1dab00a7efd (patch)
tree3907fdfc67aa5036710fe40e7783613ddf8be080
parenta07922acb9e65380b549e71841ecd30b290b4624 (diff)
downloaddrakx-net-6dd5adef4c680ae041a7b8d1e4d6a1dab00a7efd.tar
drakx-net-6dd5adef4c680ae041a7b8d1e4d6a1dab00a7efd.tar.gz
drakx-net-6dd5adef4c680ae041a7b8d1e4d6a1dab00a7efd.tar.bz2
drakx-net-6dd5adef4c680ae041a7b8d1e4d6a1dab00a7efd.tar.xz
drakx-net-6dd5adef4c680ae041a7b8d1e4d6a1dab00a7efd.zip
(reload_net_applet) fix crash when net_applet doesn't run (mga#6040)
-rw-r--r--NEWS2
-rw-r--r--lib/network/network.pm2
2 files changed, 3 insertions, 1 deletions
diff --git a/NEWS b/NEWS
index 5a99ed6..2b32c4e 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,5 @@
+- draknetcenter: fix crash when net_applet doesn't run (mga#6040)
+
1.14:
- drakinvictus: fix crashing due to missing icon (mga#5223)
- drakroam: fix a crash (mga#6847)
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 {