Git-Mirrors/onionshare
1
0
Fork 0
mirror of https://github.com/onionshare/onionshare.git synced 2024-10-01 01:35:40 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fixed crash when starting recieve mode server

Browse Source
This commit is contained in:
Micah Lee 2018-04-27 23:19:46 -07:00
parent 0996e8c064
commit 406515085e
No known key found for this signature in database
GPG Key ID: 403C2657CD994F73
2 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
onionshare/web.py
View File

@ -453,6 +453,7 @@ class Web(object):
"""
Start the flask web server.
"""
self.common.log('Web', 'start', 'port={}, stay_open={}, persistent_slug={}'.format(port, stay_open, persistent_slug))
self.generate_slug(persistent_slug)
self.stay_open = stay_open

18
onionshare_gui/receive_mode/__init__.py
View File

@ -34,6 +34,11 @@ class ReceiveMode(Mode):
"""
# Create the Web object
self.web = Web(self.common, True, True)
# Server status
self.server_status.set_mode('receive')
#self.server_status.server_stopped.connect(self.update_primary_action)
#self.server_status.server_canceled.connect(self.update_primary_action)
# Tell server_status about web, then update
self.server_status.web = self.web
@ -53,12 +58,21 @@ class ReceiveMode(Mode):
"""
pass
def start_server_custom(self):
"""
Starting the server.
"""
# Reset web counters
self.web.error404_count = 0
# Hide and reset the downloads if we have previously shared
#self.downloads.reset_downloads()
#self.reset_info_counters()
def start_server_step2_custom(self):
"""
Step 2 in starting the server.
"""
# Set up web
# Continue
self.starting_server_step3.emit()
self.start_server_finished.emit()