electrum

commit 5562239c5e5d147adc06ea8fbc4c4808374452c9
parent a95c4c67113bfc9e9436e187ae53728105d0af4c
Author: ThomasV <thomasv@gitorious>
Date:   Sat, 11 Jul 2015 12:43:06 +0200

use daemon thread to fetch alias

Diffstat:
M
gui/qt/main_window.py
 | 
14
++++++++------

1 file changed, 8 insertions(+), 6 deletions(-)
diff --git a/gui/qt/main_window.py b/gui/qt/main_window.py
@@ -184,14 +184,16 @@ class ElectrumWindow(QMainWindow):
         self.qr_window = None
         self.not_enough_funds = False
         self.pluginsdialog = None
-        self.alias_info = None
-        threading.Thread(target=self.fetch_alias_info).start()
-
+        self.fetch_alias_info()
 
     def fetch_alias_info(self):
+        self.alias_info = None
         alias = str(self.config.get('alias'))
         if alias:
-            self.alias_info = self.contacts.resolve_openalias(alias)
+            f = lambda: setattr(self, 'alias_info', self.contacts.resolve_openalias(alias))
+            t = threading.Thread(target=f)
+            t.setDaemon(True)
+            t.start()
 
     def update_account_selector(self):
         # account selector
@@ -593,7 +595,7 @@ class ElectrumWindow(QMainWindow):
         self.receive_address_e = ButtonsLineEdit()
         self.receive_address_e.addCopyButton(self.app)
         self.receive_address_e.setReadOnly(True)
-        msg = _('Bitcoin address where the payment should be received')
+        msg = _('Bitcoin address where the payment should be received. Note that each payment request uses a different Bitcoin address.')
         self.receive_address_label = HelpLabel(_('Receiving address'), msg)
         self.receive_address_e.textChanged.connect(self.update_receive_qr)
         self.receive_address_e.setFocusPolicy(Qt.NoFocus)
@@ -2531,7 +2533,7 @@ class ElectrumWindow(QMainWindow):
         def on_alias():
             alias = str(alias_e.text())
             self.config.set_key('alias', alias, True)
-            threading.Thread(target=self.fetch_alias_info).start()
+            self.fetch_alias_info()
         alias_e.editingFinished.connect(on_alias)
         tx_widgets.append((alias_label, alias_e))