Merge branch 'develop' into receiver-mode

This commit is contained in:
Micah Lee 2018-04-22 17:38:28 -07:00
commit 8c89a05fd9
No known key found for this signature in database
GPG key ID: 403C2657CD994F73
9 changed files with 139 additions and 83 deletions

View file

@ -110,8 +110,7 @@ def main():
app = OnionShare(common, onion, local_only, stay_open, shutdown_timeout)
# Launch the gui
web.stay_open = stay_open
gui = OnionShareGui(common, web, onion, qtapp, app, filenames, config)
gui = OnionShareGui(onion, qtapp, app, filenames, config, local_only)
# Clean up when app quits
def shutdown():