electrum

commit 33b94cd60e5951aeffd0a51e004d3626d9d9a882
parent 4f6ac1d613ebb5d11f5f2e349d3f3e69feac5808
Author: ThomasV <thomasv@gitorious>
Date:   Fri, 28 Mar 2014 17:37:31 +0100

add error field in tx, because exceptions cannot be passed by plugins

Diffstat:
M
gui/qt/main_window.py
 | 
5
+++++

1 file changed, 5 insertions(+), 0 deletions(-)
diff --git a/gui/qt/main_window.py b/gui/qt/main_window.py
@@ -874,6 +874,7 @@ class ElectrumWindow(QMainWindow):
         outputs = [(to_address, amount)]
         try:
             tx = self.wallet.make_unsigned_transaction(outputs, fee, None, domain)
+            tx.error = None
         except Exception as e:
             traceback.print_exc(file=sys.stdout)
             self.show_message(str(e))
@@ -903,6 +904,10 @@ class ElectrumWindow(QMainWindow):
     def send_tx2(self, tx, fee, label, dialog, password):
         dialog.accept()
         
+        if tx.error:
+            self.show_message(tx.error)
+            return
+
         if tx.requires_fee(self.wallet.verifier) and fee < MIN_RELAY_TX_FEE:
             QMessageBox.warning(self, _('Error'), _("This transaction requires a higher fee, or it will not be propagated by the network."), _('OK'))
             return