diff options
author | Micah Lee <micah@micahflee.com> | 2018-10-10 18:25:28 -0700 |
---|---|---|
committer | Micah Lee <micah@micahflee.com> | 2018-10-10 18:25:28 -0700 |
commit | c541288227674f97fc2aab2cd8c714256144703e (patch) | |
tree | 99f8f593a5e43bfd0ffb9934856fd0c1636a5d44 /onionshare_gui | |
parent | 7e8a76be8ae716d49c3c1f4a996b175361afcd97 (diff) | |
parent | 1fd647b837ac5e0b1c5dc534ee45d1b95b28f4c4 (diff) | |
download | onionshare-c541288227674f97fc2aab2cd8c714256144703e.tar.gz onionshare-c541288227674f97fc2aab2cd8c714256144703e.zip |
Merge branch 'develop' into 690_language_dropdown
Diffstat (limited to 'onionshare_gui')
-rw-r--r-- | onionshare_gui/share_mode/threads.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/onionshare_gui/share_mode/threads.py b/onionshare_gui/share_mode/threads.py index d6022746..24e2c242 100644 --- a/onionshare_gui/share_mode/threads.py +++ b/onionshare_gui/share_mode/threads.py @@ -56,5 +56,8 @@ class CompressThread(QtCore.QThread): # Let the Web and ZipWriter objects know that we're canceling compression early self.mode.web.cancel_compression = True - if self.mode.web.zip_writer: + try: self.mode.web.zip_writer.cancel_compression = True + except AttributeError: + # we never made it as far as creating a ZipWriter object + pass |