Optimize video-status control - Bugfix wrong usage of logical operators

MerlinCooper · Jun 5, 2020 · 39ae01c · 39ae01c
1 parent 15f4b14
commit 39ae01c
Showing 1 changed file with 18 additions and 2 deletions.
diff --git a/Phases/Direction/VideoCapture.cs b/Phases/Direction/VideoCapture.cs
@@ -36,18 +36,24 @@ public class VideoCapture
         Timer timer;
         List<CapturedVideoFile> captureFileNames = new List<CapturedVideoFile>();
         videoStatus curVideoStatus = videoStatus.stopped;
+
+        ~VideoCapture()
+        {
+            if(curVideoStatus != videoStatus.stopped)
+                SendKeyStroke_StartStopp();
+        }
 
         public void Activate(string workingFolder, bool bStartRecording = true)
         {
             this.workingFolder = workingFolder;
             this.started = DateTime.Now;
 
             timer = new Timer(500);
-            timer.Elapsed += CaptureNewFileNames; ;
+            timer.Elapsed += CaptureNewFileNames; 
             timer.AutoReset = false;
             timer.Enabled = true;
 
-            if (bStartRecording & (curVideoStatus != videoStatus.running))
+            if (bStartRecording && (curVideoStatus != videoStatus.running))
             {
                 SendKeyStroke_StartStopp();     //Send hot-key to start recording
                 curVideoStatus = videoStatus.running;
@@ -130,6 +136,16 @@ public void Resume()
             }
         }
 
+        public void Stop()
+        {
+            if(curVideoStatus == videoStatus.running || curVideoStatus == videoStatus.paused)
+            {
+                SendKeyStroke_StartStopp();
+                curVideoStatus = videoStatus.stopped;
+            }
+        }
+
+
         private static void SendKeyStroke_StartStopp()
         {
             TraceInfo.WriteLine("Sending key event to start/stopp recording ALT+F9");