From e17232a8e71b8eb63c7134b9172c832bde5cf797 Mon Sep 17 00:00:00 2001
From: Olivier Blin <oblin@mandriva.com>
Date: Thu, 2 Oct 2008 17:57:26 +0000
Subject: keep old network id if wpa_supplicant has not been able to scan the
 network

---
 lib/network/connection/wireless.pm | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

(limited to 'lib')

diff --git a/lib/network/connection/wireless.pm b/lib/network/connection/wireless.pm
index 20ebd8d..d6d5872 100644
--- a/lib/network/connection/wireless.pm
+++ b/lib/network/connection/wireless.pm
@@ -702,9 +702,12 @@ sub connect {
     $self->SUPER::connect;
 
     if ($self->{control}{roaming}) {
-        refresh_roaming_ids($self);
-        my $network = $self->get_selected_network;
-        my $network_id = $network->{id} if $network && defined $network->{id};
+        my $network_id;
+        foreach (0 .. 1) {
+            refresh_roaming_ids($self) if $_;
+            my $network = $self->get_selected_network;
+            $network_id = $network->{id} if $network && defined $network->{id};
+        }
         if (defined $network_id) {
             if ($net->{monitor}) {
                 eval { $net->{monitor}->select_network($network_id) };
-- 
cgit v1.2.1