git://git.novaco.in
/
electrum-nvc.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
(parent:
6f3c9e6
)
minor fixes
author
ThomasV
<thomasv@gitorious>
Fri, 13 Jun 2014 14:08:46 +0000 (16:08 +0200)
committer
ThomasV
<thomasv@gitorious>
Fri, 13 Jun 2014 14:08:46 +0000 (16:08 +0200)
gui/qt/main_window.py
patch
|
blob
|
history
lib/util.py
patch
|
blob
|
history
diff --git
a/gui/qt/main_window.py
b/gui/qt/main_window.py
index
6a9f0d4
..
ec0a743
100644
(file)
--- a/
gui/qt/main_window.py
+++ b/
gui/qt/main_window.py
@@
-980,6
+980,8
@@
class ElectrumWindow(QMainWindow):
self.payment_request = None
def pay_from_URI(self,URI):
+ if not URI:
+ return
address, amount, label, message, request_url = util.parse_URI(URI)
try:
address, amount, label, message, request_url = util.parse_URI(URI)
diff --git
a/lib/util.py
b/lib/util.py
index
c2cc91a
..
7f4e67a
100644
(file)
--- a/
lib/util.py
+++ b/
lib/util.py
@@
-163,7
+163,7
@@
def parse_URI(uri):
from decimal import Decimal
if ':' not in uri:
- assert bitcoin.is_address(url)
+ assert bitcoin.is_address(uri)
return uri, None, None, None, None
u = urlparse.urlparse(uri)