1
0

Get URIs working properly for multiple windows

This commit is contained in:
Neil Booth
2015-09-03 17:23:43 +09:00
parent 4655c5f565
commit 27917af2bf
2 changed files with 20 additions and 21 deletions

View File

@@ -20,7 +20,6 @@
from decimal import Decimal
import json
import os
import re
import sys
import time
import traceback
@@ -298,7 +297,7 @@ class ClientThread(util.DaemonThread):
if self.server.gui:
if hasattr(server.gui, 'new_window'):
path = config.get_wallet_path()
self.server.gui.new_window(path)
self.server.gui.new_window(path, config.get('url'))
response = "ok"
else:
response = "error: current GUI does not support multiple windows"
@@ -482,16 +481,6 @@ if __name__ == '__main__':
config = SimpleConfig(config_options)
cmd_name = config.get('cmd')
# check url
url = config.get('url')
if url:
if os.path.exists(url):
# assume this is a payment request
url = "bitcoin:?r=file://"+ os.path.join(os.getcwd(), url)
if not re.match('^bitcoin:', url):
print_stderr('unknown command:', url)
sys.exit(1)
# initialize plugins.
plugins = None
if not is_android: