Git-Mirrors/onionshare
1
0
Fork 0
mirror of https://github.com/onionshare/onionshare.git synced 2025-06-04 12:59:11 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'no_available_port_error' of https://github.com/mig5/onionshare into mig5-no_available_port_error

Browse source
This commit is contained in:
Micah Lee 2017-12-06 16:14:21 -08:00
commit 2ae7ce2761
5 changed files with 27 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

8
onionshare_gui/onionshare_gui.py
View file

@ -250,7 +250,7 @@ class OnionShareGui(QtWidgets.QMainWindow):
self.app.start_onion_service()
self.starting_server_step2.emit()
except (TorTooOld, TorErrorInvalidSetting, TorErrorAutomatic, TorErrorSocketPort, TorErrorSocketFile, TorErrorMissingPassword, TorErrorUnreadableCookieFile, TorErrorAuthError, TorErrorProtocolError, BundledTorTimeout) as e:
except (TorTooOld, TorErrorInvalidSetting, TorErrorAutomatic, TorErrorSocketPort, TorErrorSocketFile, TorErrorMissingPassword, TorErrorUnreadableCookieFile, TorErrorAuthError, TorErrorProtocolError, BundledTorTimeout, OSError) as e:
self.starting_server_error.emit(e.args[0])
return
@ -348,7 +348,11 @@ class OnionShareGui(QtWidgets.QMainWindow):
common.log('OnionShareGui', 'stop_server')
if self.server_status.status != self.server_status.STATUS_STOPPED:
web.stop(self.app.port)
try:
web.stop(self.app.port)
except:
# Probably we had no port to begin with (Onion service didn't start)
pass
self.app.cleanup()
self.filesize_warning.hide()
self.stop_server_finished.emit()