Corrected failure detection logic. Fixed race condition which caused

lights to turn off immediately after turning them on. Upgraded manifest to version 2.5.
sabaatworld · Jan 28, 2018 · 2c3b599 · 2c3b599
1 parent c58993a
commit 2c3b599
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 5 deletions.
diff --git a/HyperionScreenCap/Form/MainForm.cs b/HyperionScreenCap/Form/MainForm.cs
@@ -276,8 +276,11 @@ private void DisableCaptureOnFailure()
                 {
                     if ( !task.CaptureEnabled )
                     {
-                        ToggleCapture(CaptureCommand.OFF);
-                        break;
+                        // We have found a task for which capture has been disabled due to failure
+                        // Turning off capture and exiting this thread
+                        LOG.Error($"Found {task} with capture disabled due to failure. Issuing OFF command.");
+                        ToggleCapture(CaptureCommand.OFF, false, false);
+                        return;
                     }
                 }
                 Thread.Sleep(AppConstants.CAPTURE_FAILURE_DETECTION_INTERVAL);

diff --git a/HyperionScreenCap/Helper/HyperionTask.cs b/HyperionScreenCap/Helper/HyperionTask.cs
@@ -180,7 +180,6 @@ private void StartCapture()
 
         private void TryStartCapture()
         {
-            CaptureEnabled = true;
             try // Properly dispose everything object when turning off capture
             {
                 StartCapture();
@@ -196,6 +195,7 @@ private void TryStartCapture()
         public void EnableCapture()
         {
             LOG.Info($"{this}: Enabling screen capture");
+            CaptureEnabled = true;
             _captureThread = new Thread(TryStartCapture) { IsBackground = true };
             _captureThread.Start();
         }

diff --git a/HyperionScreenCap/Installation Files/InstallScript.iss b/HyperionScreenCap/Installation Files/InstallScript.iss
@@ -2,7 +2,7 @@
 ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
 
 #define MyAppName "Hyperion Screen Capture"
-#define MyAppVersion "2.4"
+#define MyAppVersion "2.5"
 #define MyAppPublisher "@sabaatworld"
 #define MyAppURL "https://github.com/sabaatworld/HyperionScreenCap"
 #define MyAppUpdatesURL "https://github.com/sabaatworld/HyperionScreenCap/releases"

diff --git a/HyperionScreenCap/Properties/AssemblyInfo.cs b/HyperionScreenCap/Properties/AssemblyInfo.cs
@@ -31,5 +31,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("2.4.0.0")]
+[assembly: AssemblyVersion("2.5.0.0")]
 //[assembly: AssemblyFileVersion("2.0.0.0")] Commented out so that it will be generated automatically