From d848e9b91d318343270016a673de33c9267b2f1c Mon Sep 17 00:00:00 2001
From: ecdsa <ecdsa@github>
Date: Sat, 9 Mar 2013 09:28:46 +0100
Subject: [PATCH 1/3] fix

---
 plugins/pointofsale.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/pointofsale.py b/plugins/pointofsale.py
index 508395ba..25dc04bf 100644
--- a/plugins/pointofsale.py
+++ b/plugins/pointofsale.py
@@ -34,7 +34,6 @@ class QR_Window(QWidget):
         self.amount = 0
         self.setFocusPolicy(QtCore.Qt.NoFocus)
 
-        self.merchant_name = config.get('merchant_name', 'Invoice')
         main_box = QHBoxLayout()
         
         self.qrw = QRCodeWidget()
@@ -100,6 +99,7 @@ def get_info():
 
 def init(gui):
     gui.requested_amounts = gui.config.get('requested_amounts',{}) 
+    gui.merchant_name = gui.config.get('merchant_name', 'Invoice')
     gui.qr_window = None
 
 

From 49a4c6c92a2ff8526a03f04e6c155d44f7a828ff Mon Sep 17 00:00:00 2001
From: ecdsa <ecdsa@github>
Date: Sun, 10 Mar 2013 10:15:09 +0100
Subject: [PATCH 2/3] do not wait for interface when launching gui

---
 electrum         | 13 ++++++++++---
 lib/interface.py |  5 -----
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/electrum b/electrum
index 18c915a5..11e10177 100755
--- a/electrum
+++ b/electrum
@@ -125,8 +125,7 @@ if __name__ == '__main__':
         interface = Interface(config, True)
         wallet.interface = interface
         interface.start()
-        if interface.is_connected:
-            interface.send([('server.peers.subscribe',[])])
+        interface.send([('server.peers.subscribe',[])])
 
         gui = gui.ElectrumGui(wallet, config)
 
@@ -241,8 +240,11 @@ if __name__ == '__main__':
             if not options.offline:
                 interface = Interface(config)
                 interface.start()
+                interface.connect_event.wait()
+                if not interface.is_connected:
+                    print_msg("Not connected, aborting.")
+                    sys.exit(1)
                 wallet.interface = interface
-
                 verifier = WalletVerifier(interface, config)
                 wallet.set_verifier(verifier)
 
@@ -359,6 +361,11 @@ if __name__ == '__main__':
         interface = Interface(config)
         interface.register_callback('connected', lambda: sys.stderr.write("Connected to " + interface.connection_msg + "\n"))
         interface.start()
+        # wait until connected
+        interface.connect_event.wait()
+        if not interface.is_connected:
+            print_msg("Not connected, aborting.")
+            sys.exit(1)
         wallet.interface = interface
         verifier = WalletVerifier(interface, config)
         wallet.set_verifier(verifier)
diff --git a/lib/interface.py b/lib/interface.py
index 83e3c860..99a50bf7 100644
--- a/lib/interface.py
+++ b/lib/interface.py
@@ -586,11 +586,6 @@ class Interface(threading.Thread):
         return out
 
 
-    def start(self):
-        threading.Thread.start(self)
-        # wait until connection is established
-        self.connect_event.wait()
-
     def run(self):
         while True:
             self.init_interface()

From 837150132d64f36c0037acf1f528e7264064ed89 Mon Sep 17 00:00:00 2001
From: ecdsa <ecdsa@github>
Date: Sun, 10 Mar 2013 10:24:42 +0100
Subject: [PATCH 3/3] optional wait parameter for interface

---
 electrum         | 13 ++-----------
 lib/interface.py |  9 +++++++++
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/electrum b/electrum
index 11e10177..ce81f032 100755
--- a/electrum
+++ b/electrum
@@ -124,7 +124,7 @@ if __name__ == '__main__':
         
         interface = Interface(config, True)
         wallet.interface = interface
-        interface.start()
+        interface.start(wait = False)
         interface.send([('server.peers.subscribe',[])])
 
         gui = gui.ElectrumGui(wallet, config)
@@ -239,11 +239,7 @@ if __name__ == '__main__':
 
             if not options.offline:
                 interface = Interface(config)
-                interface.start()
-                interface.connect_event.wait()
-                if not interface.is_connected:
-                    print_msg("Not connected, aborting.")
-                    sys.exit(1)
+                interface.start(wait=True)
                 wallet.interface = interface
                 verifier = WalletVerifier(interface, config)
                 wallet.set_verifier(verifier)
@@ -361,11 +357,6 @@ if __name__ == '__main__':
         interface = Interface(config)
         interface.register_callback('connected', lambda: sys.stderr.write("Connected to " + interface.connection_msg + "\n"))
         interface.start()
-        # wait until connected
-        interface.connect_event.wait()
-        if not interface.is_connected:
-            print_msg("Not connected, aborting.")
-            sys.exit(1)
         wallet.interface = interface
         verifier = WalletVerifier(interface, config)
         wallet.set_verifier(verifier)
diff --git a/lib/interface.py b/lib/interface.py
index 99a50bf7..59f205a6 100644
--- a/lib/interface.py
+++ b/lib/interface.py
@@ -586,6 +586,15 @@ class Interface(threading.Thread):
         return out
 
 
+    def start(self, wait=True):
+        threading.Thread.start(self)
+        if wait:
+            # wait until connection is established
+            self.connect_event.wait()
+            if not self.is_connected:
+                print_msg("Not connected, aborting.")
+                sys.exit(1)
+
     def run(self):
         while True:
             self.init_interface()