made --local-only work in GUI (#58)

This commit is contained in:
Micah Lee 2014-06-26 14:26:41 -04:00
parent 2b8be2781c
commit c74e259fb4

View file

@ -106,11 +106,13 @@ def main():
# try starting hidden service # try starting hidden service
onionshare_port = onionshare.choose_port() onionshare_port = onionshare.choose_port()
try: local_host = "127.0.0.1:{0}".format(onionshare_port)
onion_host = onionshare.start_hidden_service(onionshare_port) if not local_only:
except onionshare.NoTor as e: try:
alert(e.args[0], QMessageBox.Warning) onion_host = onionshare.start_hidden_service(onionshare_port)
return except onionshare.NoTor as e:
alert(e.args[0], QMessageBox.Warning)
return
onionshare.tails_open_port(onionshare_port) onionshare.tails_open_port(onionshare_port)
# select file to share # select file to share
@ -122,7 +124,10 @@ def main():
webapp.onionshare = onionshare webapp.onionshare = onionshare
webapp.onionshare_port = onionshare_port webapp.onionshare_port = onionshare_port
webapp.filename = filename webapp.filename = filename
webapp.onion_host = onion_host if not local_only:
webapp.onion_host = onion_host
else:
webapp.onion_host = local_host
webapp.qtapp = app webapp.qtapp = app
webapp.clipboard = app.clipboard() webapp.clipboard = app.clipboard()