1 files changed, 10 insertions, 0 deletions
diff --git a/src/command.py b/src/command.py
index 18f7408..cd3c6c3 100644
--- a/src/command.py
+++ b/src/command.py
@@ -8,6 +8,7 @@ import argparse
 import os
 import sys
 import time
+import signal
 
 from core import Core
 
@@ -19,6 +20,7 @@ class Command(QtCore.QObject):
     def __init__(self):
         QtCore.QObject.__init__(self)
         self.core = Core()
+        Core.mode = 'commandline'
         self.dataDir = self.core.dataDir
         self.canceled = False
 
@@ -90,6 +92,9 @@ class Command(QtCore.QObject):
                 for arg in args:
                     self.core.selectedComponents[i].command(arg)
 
+        # ctrl-c stops the export thread
+        signal.signal(signal.SIGINT, self.stopVideo)
+
         if self.args.export and self.args.projpath:
             errcode, data = self.core.parseAvFile(projPath)
             for key, value in data['WindowFields']:
@@ -123,6 +128,11 @@ class Command(QtCore.QObject):
         self.worker.progressBarSetText.connect(self.progressBarSetText)
         self.createVideo.emit()
 
+    def stopVideo(self, *args):
+        self.worker.error = True
+        self.worker.cancelExport()
+        self.worker.cancel()
+
     @QtCore.pyqtSlot(str)
     def progressBarSetText(self, value):
         if 'Export ' in value: