aboutsummaryrefslogtreecommitdiff
path: root/desktop/src/onionshare
diff options
context:
space:
mode:
authorMicah Lee <micah@micahflee.com>2021-11-07 12:12:12 -0800
committerMicah Lee <micah@micahflee.com>2021-11-07 12:12:12 -0800
commit9430439b5f02829e3677ac187e1db7a52076ddad (patch)
tree36208e4077b23bccc379272ed2c2ef93a04b6ec1 /desktop/src/onionshare
parent472e383b7d0f4040e4963ffff95da1e86fe85cca (diff)
downloadonionshare-9430439b5f02829e3677ac187e1db7a52076ddad.tar.gz
onionshare-9430439b5f02829e3677ac187e1db7a52076ddad.zip
Fix meek-client in Windows
Diffstat (limited to 'desktop/src/onionshare')
-rw-r--r--desktop/src/onionshare/moat_dialog.py10
1 files changed, 8 insertions, 2 deletions
diff --git a/desktop/src/onionshare/moat_dialog.py b/desktop/src/onionshare/moat_dialog.py
index 85b5e888..84a52390 100644
--- a/desktop/src/onionshare/moat_dialog.py
+++ b/desktop/src/onionshare/moat_dialog.py
@@ -26,7 +26,7 @@ import json
from . import strings
from .gui_common import GuiCommon
-from onionshare_cli.meek import MeekNotFound
+from onionshare_cli.meek import MeekNotFound, MeekNotRunning
class MoatDialog(QtWidgets.QDialog):
@@ -237,7 +237,13 @@ class MoatThread(QtCore.QThread):
try:
self.meek.start()
except MeekNotFound:
- self.common.log("MoatThread", "run", f"Could not find the Meek Client")
+ self.common.log("MoatThread", "run", f"Could not find meek-client")
+ self.bridgedb_error.emit()
+ return
+ except MeekNotRunning:
+ self.common.log(
+ "MoatThread", "run", f"Ran meek-client, but there was an error"
+ )
self.bridgedb_error.emit()
return