aboutsummaryrefslogtreecommitdiff
path: root/src/components/video.py
diff options
context:
space:
mode:
authortassaron2017-08-20 18:36:43 -0400
committertassaron2017-08-20 18:36:43 -0400
commit6bf8a553d6170e0ca6e7d2002e46ae327a6e5e81 (patch)
treeb97c9c2d334772fff1c38c5a6a2a4a5b3e6863e4 /src/components/video.py
parentbe9eb9077b2234e6d91c78d70bb8e1d8347b03aa (diff)
don't merge undos when setting text with a button
plus changes to life.py for pep8 compliance
Diffstat (limited to 'src/components/video.py')
-rw-r--r--src/components/video.py2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/components/video.py b/src/components/video.py
index 9c0d608..e6486ea 100644
--- a/src/components/video.py
+++ b/src/components/video.py
@@ -117,7 +117,9 @@ class Component(Component):
)
if filename:
self.settings.setValue("componentDir", os.path.dirname(filename))
+ self.mergeUndo = False
self.page.lineEdit_video.setText(filename)
+ self.mergeUndo = True
def getPreviewFrame(self, width, height):
if not self.videoPath or not os.path.exists(self.videoPath):