2005-04-11 Jordi Mas i Hernandez <jordi@ximian.com>

	* Timer.cs: fixes interval setting when the timer is already enabled

svn path=/trunk/mcs/; revision=42785

diff --git a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
index 82db592c322683d025cc628e293789ecc6278572..81eae0312488c4f9d1070ab75def2692165b6cff 100644 (file)
--- a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
+++ b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
@@ -1,3 +1,7 @@
+2005-04-11  Jordi Mas i Hernandez <jordi@ximian.com>
+
+       * Timer.cs: fixes interval setting when the timer is already enabled
+       
 2005-04-10  Alexander Olk  <xenomorph2@onlinehome.de>
 
        * FolderBrowserDialog.cs: First approach

diff --git a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/Timer.cs b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/Timer.cs
index f024c30a5b91cf15f30e70d3aecb88b75accf699..8bf732fff94671c640578fe8f3ff2d526c03f680 100644 (file)
--- a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/Timer.cs
+++ b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/Timer.cs
@@ -73,9 +73,19 @@ namespace System.Windows.Forms {
                                return interval;
                        }
                        set {
+                               if (interval == value) {
+                                       return;
+                               }
+                               
                                interval = value;
+                                                               
                                // Use AddTicks so we get some rounding
                                expires = DateTime.Now.AddMilliseconds (interval > Minimum ? interval : Minimum);
+                                                                       
+                               if (enabled == true) {                          
+                                       XplatUI.KillTimer (this);
+                                       XplatUI.SetTimer (this);
+                               }
                        }
                }