Git-Mirrors/onionshare
1
0
Fork 0
mirror of https://github.com/onionshare/onionshare.git synced 2025-05-07 17:05:16 -04:00
Code Issues Projects Releases Packages Wiki Activity

Fix a race condition where the URL was sometimes getting copied to the clipboard before it was actually generated, causing a crash

Browse source
This commit is contained in:
Micah Lee 2018-04-28 15:00:23 -07:00
parent 1456361566
commit 1a4aaa70fa
No known key found for this signature in database
GPG key ID: 403C2657CD994F73
4 changed files with 29 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

20
onionshare_gui/mode.py
View file

@ -138,6 +138,19 @@ class Mode(QtWidgets.QWidget):
# Start the onion service in a new thread
def start_onion_service(self):
# Choose a port for the web app
self.app.choose_port()
# Start http service in new thread
t = threading.Thread(target=self.web.start, args=(self.app.port, self.app.stay_open, self.common.settings.get('slug')))
t.daemon = True
t.start()
# Wait for the web app slug to generate before continuing
while self.web.slug == None:
time.sleep(0.1)
# Now start the onion service
try:
self.app.start_onion_service()
self.starting_server_step2.emit()
@ -148,13 +161,6 @@ class Mode(QtWidgets.QWidget):
self.app.stay_open = not self.common.settings.get('close_after_first_download')
# Start http service in new thread
t = threading.Thread(target=self.web.start, args=(self.app.port, self.app.stay_open, self.common.settings.get('slug')))
t.daemon = True
t.start()
# Wait for modules in thread to load, preventing a thread-related cx_Freeze crash
time.sleep(0.2)
self.common.log('Mode', 'start_server', 'Starting an onion thread')
self.t = OnionThread(self.common, function=start_onion_service, kwargs={'self': self})
self.t.daemon = True