From 6bf8a553d6170e0ca6e7d2002e46ae327a6e5e81 Mon Sep 17 00:00:00 2001
From: tassaron
Date: Sun, 20 Aug 2017 18:36:43 -0400
Subject: don't merge undos when setting text with a button

plus changes to life.py for pep8 compliance
---
 src/components/video.py | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'src/components/video.py')

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):
-- 
cgit v1.2.3