V1.2.0 - Fixed Timer bug

ktheod · Mar 8, 2019 · da5df83 · da5df83
1 parent 2235610
commit da5df83
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 8 deletions.
diff --git a/OneDriveBully/MyFunctions.cs b/OneDriveBully/MyFunctions.cs
@@ -20,15 +20,14 @@ public class MyFunctions
 
         //Timer Variables
         private System.Timers.Timer MyTimer;
-        private Int32 interval;
         private Int32 timeRemaining;
 
         public void initApp()
         {
             initTimer();
             checkUserSettings();
             if (UserDefinedSettingsExist)
-            {                
+            {
                 setTimerInterval(Properties.Settings.Default.TimerInterval);
             }
         }
@@ -101,8 +100,8 @@ public void setTimerInterval(Int32 newInterval)
             }
             else
             {
-                interval = newInterval * 60 * 1000;
-                MyTimer.Interval = interval;
+                timeRemaining = newInterval * 60 * 1000;
+                MyTimer.Interval = 1 * 60 * 1000; //Check timer every 1 minute
 
                 stopTimer();
                 startTimer();
@@ -114,7 +113,6 @@ public void startTimer()
             MyTimer.Elapsed += new ElapsedEventHandler(OnTimedEvent);
             MyTimer.Enabled = true;
 
-            timeRemaining = interval;
             UpdateIconText(0);
         }
 
@@ -130,7 +128,6 @@ private void OnTimedEvent(object source, ElapsedEventArgs e)
             if (timeRemaining <= 0)
             {
                 bullyNow();
-                timeRemaining = interval;
             }
             UpdateIconText(0);
         }

diff --git a/OneDriveBully/Properties/AssemblyInfo.cs b/OneDriveBully/Properties/AssemblyInfo.cs
@@ -32,5 +32,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("1.1.0.0")]
-[assembly: AssemblyFileVersion("1.1.0.0")]
+[assembly: AssemblyVersion("1.2.0.0")]
+[assembly: AssemblyFileVersion("1.2.0.0")]