2.2.0.10 - Fixed bug with count value when display is not available

Author: igloo-gkendall

FormMain.cs

@@ -2410,17 +2410,20 @@ private void TakeScreenshot()
         {
             formScreen.RefreshScreenDictionary();
 
-            _screenCapture.Count++;
+            if (_screenCapture.GetScreenImages(0, 0, 0, 0, 0, false, out Bitmap bitmap))
+            {
+                _screenCapture.Count++;
 
-            _screenCapture.DateTimePreviousCycle = DateTime.Now;
+                _screenCapture.DateTimePreviousCycle = DateTime.Now;
 
-            _screenCapture.ActiveWindowTitle = _screenCapture.GetActiveWindowTitle();
+                _screenCapture.ActiveWindowTitle = _screenCapture.GetActiveWindowTitle();
 
-            _screenCapture.ActiveWindowProcessName = _screenCapture.GetActiveWindowProcessName();
+                _screenCapture.ActiveWindowProcessName = _screenCapture.GetActiveWindowProcessName();
 
-            RunRegionCaptures();
+                RunRegionCaptures();
 
-            RunScreenCaptures();
+                RunScreenCaptures();
+            }
         }
 
         /// <summary>
@@ -2690,18 +2693,9 @@ private void RunRegionCaptures()
                         }
                         else
                         {
-                            _screenCapture.Count--;
                             ScreenshotTakenWithFailure();
                         }
                     }
-                    else
-                    {
-                        _screenCapture.Count--;
-                    }
-                }
-                else
-                {
-                    _screenCapture.Count--;
                 }
             }
         }
@@ -2742,19 +2736,10 @@ private void RunScreenCaptures()
                             }
                             else
                             {
-                                _screenCapture.Count--;
                                 ScreenshotTakenWithFailure();
                                 break;
                             }
                         }
-                        else
-                        {
-                            _screenCapture.Count--;
-                        }
-                    }
-                    else
-                    {
-                        _screenCapture.Count--;
                     }
                 }
                 else
@@ -2793,19 +2778,10 @@ private void RunScreenCaptures()
                                 }
                                 else
                                 {
-                                    _screenCapture.Count--;
                                     ScreenshotTakenWithFailure();
                                     break;
                                 }
                             }
-                            else
-                            {
-                                _screenCapture.Count--;
-                            }
-                        }
-                        else
-                        {
-                            _screenCapture.Count--;
                         }
                     }
                 }

Properties/AssemblyInfo.cs

@@ -32,6 +32,6 @@
 // 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.2.0.9")]
-[assembly: AssemblyFileVersion("2.2.0.9")]
+[assembly: AssemblyVersion("2.2.0.10")]
+[assembly: AssemblyFileVersion("2.2.0.10")]
 [assembly: NeutralResourcesLanguageAttribute("en-CA")]

ScreenCapture.cs

@@ -249,12 +249,9 @@ public bool GetScreenImages(int component, int x, int y, int width, int height,
 
             if (bitmap != null)
             {
-                Log.Write("Images of screens retrieved");
                 return true;
             }
 
-            Log.Write("No screen images available. User may not be logged in");
-
             return false;
         }
 

app.manifest

@@ -3,7 +3,7 @@
   <assemblyIdentity
     type="win32"
     name="GavinKendall.AutoScreenCapture"
-    version="2.2.0.9"/>
+    version="2.2.0.10"/>
   <asmv3:application>
     <asmv3:windowsSettings xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">
       <dpiAware>True/PM</dpiAware>

settings/Settings.cs

@@ -13,7 +13,7 @@ namespace AutoScreenCapture
     public static class Settings
     {
         public static readonly string ApplicationName = "Auto Screen Capture";
-        public static readonly string ApplicationVersion = "2.2.0.9";
+        public static readonly string ApplicationVersion = "2.2.0.10";
         public static readonly string ApplicationCodename = "Dalek";
 
         public static SettingCollection Application;