Merge ~nteodosio/software-properties:network into software-properties:ubuntu/master

[Nathan Teodosio]

[Sebastien Bacher (seb128)]

Thanks!

diff --git a/softwareproperties/gtk/DialogUaAttach.py b/softwareproperties/gtk/DialogUaAttach.py
index 42d5365..5de167c 100644
--- a/softwareproperties/gtk/DialogUaAttach.py
+++ b/softwareproperties/gtk/DialogUaAttach.py
@@ -46,8 +46,6 @@ class DialogUaAttach:
             self.net_monitor, self.net_monitor.get_network_available(), 1
         )
 
-        self.start_magic_attach()
-
     def run(self):
         self.dialog.run()
         self.dialog.hide()
@@ -191,9 +189,12 @@ class DialogUaAttach:
         self.no_connection.set_visible(not available)
         self.radio_net_control_box.set_sensitive(available)
         self.confirm_net_control_box.set_sensitive(available)
-        # wait() may have timed out without internet; Restart polling.
-        if (available and self.poll == None and not first_run):
-            self.poll = GLib.Thread.new("poll", self.poll_for_magic_token)
+        if available:
+            if self.pin == "":
+                self.start_magic_attach()
+            elif self.poll == None:
+                # wait() timed out without internet; Restart polling.
+                self.poll = GLib.Thread.new("poll", self.poll_for_magic_token)
 
     def finish(self):
         self.dialog.response(Gtk.ResponseType.OK)