commit 81c00956e86fb0649fc03ff72545e12702222619
parent 5f4bcb420b652b38eaa94755338b5d3f1efa69be
Author: ThomasV <thomasv@gitorious>
Date: Sat, 13 Sep 2014 15:23:35 +0200
perform easy test first (lazy evaluation)
Diffstat:
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/gui/qt/main_window.py b/gui/qt/main_window.py
@@ -1091,7 +1091,7 @@ class ElectrumWindow(QMainWindow):
self.show_message(str(e))
return
- if tx.requires_fee(self.wallet.verifier) and tx.get_fee() < MIN_RELAY_TX_FEE:
+ if tx.get_fee() < MIN_RELAY_TX_FEE and tx.requires_fee(self.wallet.verifier):
QMessageBox.warning(self, _('Error'), _("This transaction requires a higher fee, or it will not be propagated by the network."), _('OK'))
return