Undo feature

1 files changed, 16 insertions, 8 deletions

diff --git a/src/toolkit/ffmpeg.py b/src/toolkit/ffmpeg.py
index 8fe9148..d78d803 100644
--- a/src/toolkit/ffmpeg.py
+++ b/src/toolkit/ffmpeg.py
@@ -91,16 +91,24 @@ class FfmpegVideo:
 
     def fillBuffer(self):
         from component import ComponentError
-        logFilename = os.path.join(
-            core.Core.logDir, 'render_%s.log' % str(self.component.compPos))
-        log.debug('Creating ffmpeg process (log at %s)' % logFilename)
-        with open(logFilename, 'w') as logf:
-            logf.write(" ".join(self.command) + '\n\n')
-        with open(logFilename, 'a') as logf:
+        if core.Core.logEnabled:
+            logFilename = os.path.join(
+                core.Core.logDir, 'render_%s.log' % str(self.component.compPos)
+            )
+            log.debug('Creating ffmpeg process (log at %s)', logFilename)
+            with open(logFilename, 'w') as logf:
+                logf.write(" ".join(self.command) + '\n\n')
+            with open(logFilename, 'a') as logf:
+                self.pipe = openPipe(
+                    self.command, stdin=subprocess.DEVNULL,
+                    stdout=subprocess.PIPE, stderr=logf, bufsize=10**8
+                )
+        else:
             self.pipe = openPipe(
                 self.command, stdin=subprocess.DEVNULL, stdout=subprocess.PIPE,
-                stderr=logf, bufsize=10**8
+                stderr=subprocess.DEVNULL, bufsize=10**8
             )
+
         while True:
             if self.parent.canceled:
                 break
@@ -157,7 +165,7 @@ def findFfmpeg():
                         ['ffmpeg', '-version'], stderr=f
                     )
                 return "ffmpeg"
-            except subprocess.CalledProcessError:
+            except (subprocess.CalledProcessError, FileNotFoundError):
                 return "avconv"