* Fixed respective return values of make_thumbs() and abort_build().
authorUrban Wallasch <urban.wallasch@freenet.de>
Thu, 27 May 2021 23:51:05 +0000 (01:51 +0200)
committerUrban Wallasch <urban.wallasch@freenet.de>
Fri, 28 May 2021 11:16:57 +0000 (13:16 +0200)
ffpreview.py

index 96998804c81010a7ebb7a6460202687cf8adecac..4e7b40f2ecc02de80bae223d2e35051ce3f18d97 100755 (executable)
@@ -1609,6 +1609,7 @@ class sMainWindow(QMainWindow):
                      'incomplete set of thumbnails.\n\nAbort anyway?')
         if QMessageBox.Yes == mbox.exec_():
             kill_proc()
+            return True
 
     def force_rebuild(self):
         if self.thinfo['duration'] > 300:
@@ -1874,7 +1875,7 @@ def make_thumbs(vidfile, thinfo, thdir, prog_cb=None):
         with open(os.path.join(thdir, _FFPREVIEW_IDX), 'w') as idxfile:
             thinfo['date'] = int(time.time())
             json.dump(thinfo, idxfile, indent=2)
-            rc = True
+        rc = (retval == 0)
     except Exception as e:
         eprint(0, cmd, '\n  failed:', str(e))
         proc = kill_proc(proc)