Merge in develop

This commit is contained in:
Micah Lee 2018-10-09 21:29:46 -07:00
commit 18f83589aa
No known key found for this signature in database
GPG key ID: 403C2657CD994F73
4 changed files with 214 additions and 11 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