summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mageia.org>2012-09-04 18:12:46 +0000
committerThierry Vignaud <tv@mageia.org>2012-09-04 18:12:46 +0000
commitc4054df9e3a526a5e26f525f6b6aff172d18c400 (patch)
tree8a5bc479c3b8c6e81f5c15f80de54d1831d2e2f0
parent81c51f25c9d99546175d08b68aafff424df1bb26 (diff)
downloaddrakx-net-c4054df9e3a526a5e26f525f6b6aff172d18c400.tar
drakx-net-c4054df9e3a526a5e26f525f6b6aff172d18c400.tar.gz
drakx-net-c4054df9e3a526a5e26f525f6b6aff172d18c400.tar.bz2
drakx-net-c4054df9e3a526a5e26f525f6b6aff172d18c400.tar.xz
drakx-net-c4054df9e3a526a5e26f525f6b6aff172d18c400.zip
(check_setup) fix a crash (mga#6847)
it would be better to make button insensitive until a network is selected though...
-rw-r--r--NEWS1
-rw-r--r--lib/network/connection_manager.pm1
2 files changed, 2 insertions, 0 deletions
diff --git a/NEWS b/NEWS
index 3fb4267..1ce559d 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,4 @@
+- drakroam: fix a crash (mga#6847)
- use chroot's /etc/resolv.conf if stage1 didn't write any
(Derek Jennings, mga#5772)
- wait for network to show up the same way as in the installer
diff --git a/lib/network/connection_manager.pm b/lib/network/connection_manager.pm
index 535e278..e3f91bd 100644
--- a/lib/network/connection_manager.pm
+++ b/lib/network/connection_manager.pm
@@ -125,6 +125,7 @@ sub write_settings {
sub configure_connection {
my ($cmanager) = @_;
+ return if !ref($cmanager->{connection});
if (!$cmanager->check_setup) {
$cmanager->setup_connection or return;