2004-04-13 Andreas Nahr <ClassDevelopment@A-SoftTech.com>

[mono.git] / mcs / class / System.Windows.Forms / System.Windows.Forms / Timer.cs

diff --git a/mcs/class/System.Windows.Forms/System.Windows.Forms/Timer.cs b/mcs/class/System.Windows.Forms/System.Windows.Forms/Timer.cs
index 14aa2eb52c3209824a3d206ae71c454bec6072b2..06854e917c028352c90dfa6eeb8e728cda711315 100644 (file)
--- a/mcs/class/System.Windows.Forms/System.Windows.Forms/Timer.cs
+++ b/mcs/class/System.Windows.Forms/System.Windows.Forms/Timer.cs
@@ -40,6 +40,9 @@ namespace System.Windows.Forms {
                        set { 
                                enabled = value;
                                if ( enabled ) {
+                                       if ( timerid != 0 )
+                                               Win32.KillTimer ( IntPtr.Zero , timerid );
+
                                        if ( !timerHandle.IsAllocated )
                                                timerHandle = GCHandle.Alloc( this );