Fix office-format handling by the GUI

1 files changed, 7 insertions, 3 deletions

diff --git a/mat-gui b/mat-gui
index d5c1815..4785d82 100755
--- a/mat-gui
+++ b/mat-gui
@@ -409,14 +409,18 @@ non-anonymised) file to output archive'))
             msg = _('Cleaning %s') % self.liststore[line][1].decode('utf-8', 'replace')
             logging.info(msg)
             self.statusbar.push(0, msg)
-            if isinstance(self.liststore[line][0].file, archive.GenericArchiveStripper):
-                list_to_add = []
+            is_archive = isinstance(self.liststore[line][0].file, archive.GenericArchiveStripper)
+            is_terminal = isinstance(self.liststore[line][0].file, archive.TerminalZipStripper)
+            list_to_add = []
+            if is_archive and not is_terminal:
                 unsupported_list = self.liststore[line][0].file.list_unsupported()
                 if type(unsupported_list) == list and unsupported_list:
                     logging.debug("Unsupported list: %s" % unsupported_list)
                     filename = os.path.basename(self.liststore[line][0].file.filename)
                     list_to_add = self.__popup_archive(filename, unsupported_list)
-            if self.liststore[line][0].file.remove_all(whitelist=list_to_add):
+                if self.liststore[line][0].file.remove_all(whitelist=list_to_add):
+                    self.liststore[line][2] = _('Clean')
+            elif self.liststore[line][0].file.remove_all():
                 self.liststore[line][2] = _('Clean')
             yield True
         self.statusbar.push(0, _('Ready'))