Merge branch 'develop' into 690_language_dropdown

This commit is contained in:
Micah Lee 2018-10-10 18:25:28 -07:00
commit 74c3a4d75c
4 changed files with 213 additions and 13 deletions

View file

@ -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