summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mageia.org>2012-09-05 17:29:06 +0000
committerThierry Vignaud <tv@mageia.org>2012-09-05 17:29:06 +0000
commit770ca149030ee1a9af4fe805fac7d03b98533656 (patch)
tree45a85bd74901ad6773e68168ef31025c2c9b8760
parentea1061dfa704b77fa3beadec17c5ca56ff0c9bc1 (diff)
downloaddrakx-net-770ca149030ee1a9af4fe805fac7d03b98533656.tar
drakx-net-770ca149030ee1a9af4fe805fac7d03b98533656.tar.gz
drakx-net-770ca149030ee1a9af4fe805fac7d03b98533656.tar.bz2
drakx-net-770ca149030ee1a9af4fe805fac7d03b98533656.tar.xz
drakx-net-770ca149030ee1a9af4fe805fac7d03b98533656.zip
(check_setup) fix a crash (mga#6847)
it would be better to make button insensitive until a network is selected though... (backported from trunk)
-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 3b65cc1..cad1e87 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,4 @@
+- 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
(Derek Jennings, mga#5830)
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;