fix #16

handle negative values for speed
SIRprise · Apr 5, 2023 · 3a4b2d2 · 3a4b2d2
1 parent a8a9696
commit 3a4b2d2
Show file tree

Hide file tree

Showing 4 changed files with 33 additions and 8 deletions.
diff --git a/SSD-LED/Form1.cs b/SSD-LED/Form1.cs
@@ -265,8 +265,8 @@ public void SSDActivityWMI()
 
         public bool SSDActivityPerfCount()
         {
-            float bytesPSRead;
-            float bytesPSWrite;
+            float bytesPSRead=0f;
+            float bytesPSWrite=0f;
 
             if (!checkBox1.Checked || (diskSelectionPFCStr == null))
             {
@@ -277,7 +277,7 @@ public bool SSDActivityPerfCount()
                 }
                 catch (Exception ex)
                 {
-                    Log.Error("PhysicalDisk->_Total could not captured - Exception here: {exc}", ex);
+                    Log.Error("PhysicalDisk->_Total could not be captured - Exception here: {exc}", ex);
                     return false;
                 }
             }
@@ -295,6 +295,19 @@ public bool SSDActivityPerfCount()
                 }
             }
 
+            //this cases should never happen (but happened probably caused by uninitialized floats bytesPSRead/Write - fixed now)
+            if (bytesPSRead<0)
+            {
+                Log.Error("PhysicalDisk _diskReadCounter was negative:{numb}", bytesPSRead);
+                return false;
+            }
+
+            if (bytesPSWrite < 0)
+            {
+                Log.Error("PhysicalDisk _diskWriteCounter was negative:{numb}", bytesPSWrite);
+                return false;
+            }
+
             //notifyIcon.Text = Math.Round(bytesPSRead / 1024, 2).ToString() + " KB/s read / " + Math.Round(bytesPSWrite / 1024, 2).ToString() + " KB/s write";
 
             Color newColor = CalculateColor(bytesPSRead, bytesPSWrite);
@@ -343,6 +356,18 @@ private Color CalculateColor(float bytesPSRead, float bytesPSWrite)
                 scaledKBSRead = scaledKBSRead > 255 ? 255 : scaledKBSRead;
                 scaledKBSWrite = scaledKBSWrite > 255 ? 255 : scaledKBSWrite;
 
+                if(scaledKBSRead < 0)
+                {
+                    scaledKBSRead = 0;
+                    Log.Error("scaledKBSRead < 0 --> {numb}",scaledKBSRead);
+                }
+
+                if(scaledKBSWrite < 0)
+                {
+                    scaledKBSWrite = 0;
+                    Log.Error("scaledKBSWrite < 0 --> {numb}", scaledKBSWrite);
+                }
+
 
                 int R = (int)(((readColor.R / 255f) * scaledKBSRead + (writeColor.R / 255f) * scaledKBSWrite));// / 2);
                 int G = (int)(((readColor.G / 255f) * scaledKBSRead + (writeColor.G / 255f) * scaledKBSWrite));// / 2);

diff --git a/SSD-LED/Properties/AssemblyInfo.cs b/SSD-LED/Properties/AssemblyInfo.cs
@@ -10,7 +10,7 @@
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("")]
 [assembly: AssemblyProduct("SSD-LED")]
-[assembly: AssemblyCopyright("Copyright ©  2022")]
+[assembly: AssemblyCopyright("Copyright ©  2023")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
@@ -32,5 +32,5 @@
 // Sie können alle Werte angeben oder die standardmäßigen Build- und Revisionsnummern 
 // übernehmen, indem Sie "*" eingeben:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.7.1")]
-[assembly: AssemblyFileVersion("1.0.7.1")]
+[assembly: AssemblyVersion("1.0.7.5")]
+[assembly: AssemblyFileVersion("1.0.7.5")]
diff --git a/SSD-LED/SSD-LED.csproj b/SSD-LED/SSD-LED.csproj
@@ -24,8 +24,8 @@
     <UpdateRequired>false</UpdateRequired>
     <MapFileExtensions>true</MapFileExtensions>
     <AutorunEnabled>true</AutorunEnabled>
-    <ApplicationRevision>4</ApplicationRevision>
-    <ApplicationVersion>1.0.7.4</ApplicationVersion>
+    <ApplicationRevision>5</ApplicationRevision>
+    <ApplicationVersion>1.0.7.5</ApplicationVersion>
     <UseApplicationTrust>false</UseApplicationTrust>
     <PublishWizardCompleted>true</PublishWizardCompleted>
     <BootstrapperEnabled>true</BootstrapperEnabled>

diff --git a/SSD-LED/bin/Release/SSD-LED.exe b/SSD-LED/bin/Release/SSD-LED.exe