diff options
author | Miguel Jacq <mig@mig5.net> | 2021-05-06 14:30:29 +1000 |
---|---|---|
committer | Miguel Jacq <mig@mig5.net> | 2021-05-06 14:30:29 +1000 |
commit | b385d6bac762def082dea4215424c7b39995b43e (patch) | |
tree | 1c0c360058557744f072a2ee92da073b21fc8c69 /cli/onionshare_cli/mode_settings.py | |
parent | e0b378055c6f0eb7033649f73ca4f96105c0496e (diff) | |
parent | 1b54f7a6189bfd25226bfc0c6f9ebcc11ee62d4b (diff) | |
download | onionshare-b385d6bac762def082dea4215424c7b39995b43e.tar.gz onionshare-b385d6bac762def082dea4215424c7b39995b43e.zip |
merge from develop and fix conflicts, update poetry
Diffstat (limited to 'cli/onionshare_cli/mode_settings.py')
-rw-r--r-- | cli/onionshare_cli/mode_settings.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/cli/onionshare_cli/mode_settings.py b/cli/onionshare_cli/mode_settings.py index 20335614..736b6c31 100644 --- a/cli/onionshare_cli/mode_settings.py +++ b/cli/onionshare_cli/mode_settings.py @@ -55,6 +55,8 @@ class ModeSettings: "receive": { "data_dir": self.build_default_receive_data_dir(), "webhook_url": None, + "disable_text": False, + "disable_files": False, }, "website": {"disable_csp": False, "filenames": []}, "chat": {"room": "default"}, @@ -128,7 +130,7 @@ class ModeSettings: self.fill_in_defaults() self.common.log("ModeSettings", "load", f"loaded {self.filename}") return - except: + except Exception: pass # If loading settings didn't work, create the settings file |