Merge from HEAD: r14160
- Don't try to kill non-existing timers.
- Close dialog using EndDialog instead of DestroyWindow.

Modified: branches/ros-branch-0_2_6/reactos/subsys/system/taskmgr/taskmgr.c

--- branches/ros-branch-0_2_6/reactos/subsys/system/taskmgr/taskmgr.c	2005-03-23 17:06:29 UTC (rev 14276)
+++ branches/ros-branch-0_2_6/reactos/subsys/system/taskmgr/taskmgr.c	2005-03-23 17:07:48 UTC (rev 14277)
@@ -257,7 +257,7 @@

             OnAbout();
             break;
         case ID_FILE_EXIT:

-            DestroyWindow(hDlg);

+            EndDialog(hDlg, IDOK);

             break;
         }     
         break;
@@ -590,23 +590,12 @@

     TabCtrl_SetCurFocus/*Sel*/(hTabWnd, 2);
     TabCtrl_SetCurFocus/*Sel*/(hTabWnd, nActivePage);
 

-    if (TaskManagerSettings.UpdateSpeed == 0)
-        KillTimer(hWnd, 1);
-    else if (TaskManagerSettings.UpdateSpeed == 1)
-    {
-        KillTimer(hWnd, 1);

+    if (TaskManagerSettings.UpdateSpeed == 1)

         SetTimer(hWnd, 1, 1000, NULL);

-    }

     else if (TaskManagerSettings.UpdateSpeed == 2)

-    {
-        KillTimer(hWnd, 1);

         SetTimer(hWnd, 1, 2000, NULL);

-    }

     else if (TaskManagerSettings.UpdateSpeed == 4)

-    {
-        KillTimer(hWnd, 1);

         SetTimer(hWnd, 1, 4000, NULL);

-    }

 
     /*
      * Refresh the performance data