aboutsummaryrefslogtreecommitdiff
path: root/src/mainwindow.py
diff options
context:
space:
mode:
authortassaron2017-07-25 17:44:59 -0400
committertassaron2017-07-25 17:44:59 -0400
commit661526b0739115594fda4c0e876398cdc940fbe1 (patch)
treec5bfdf136bd7f72abed54d3bb83d831bcfc43555 /src/mainwindow.py
parentd25dee6afc0cc72f477b577623079b4d644957a8 (diff)
repeated errors don't cause repeated windows
Diffstat (limited to 'src/mainwindow.py')
-rw-r--r--src/mainwindow.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/mainwindow.py b/src/mainwindow.py
index 03b8dde..3cc5d26 100644
--- a/src/mainwindow.py
+++ b/src/mainwindow.py
@@ -314,7 +314,7 @@ class MainWindow(QtWidgets.QMainWindow):
['ffmpeg', '-version'], stderr=f
)
goodVersion = str(ffmpegVers).split()[2].startswith('3')
- except:
+ except Exception:
goodVersion = False
else:
goodVersion = True
@@ -381,7 +381,7 @@ class MainWindow(QtWidgets.QMainWindow):
)
@QtCore.pyqtSlot()
- def cleanUp(self):
+ def cleanUp(self, *args):
self.timer.stop()
self.previewThread.quit()
self.previewThread.wait()