Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-12-31 19:42:51 +00:00
Code Issues Projects Releases Packages Wiki Activity

- Don't try to kill non-existing timers.

Browse source 
- Close dialog using EndDialog instead of DestroyWindow.

svn path=/trunk/; revision=14160
This commit is contained in:
Filip Navara 2005-03-17 13:17:05 +00:00
parent 643a182dd0
commit f60f345d30
1 changed files with 2 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
reactos/subsys/system/taskmgr/taskmgr.c
View file

@ -257,7 +257,7 @@ TaskManagerWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
OnAbout(); OnAbout();
break; break;
case ID_FILE_EXIT: case ID_FILE_EXIT:
DestroyWindow(hDlg); EndDialog(hDlg, IDOK);
break; break;
} }
break; break;
@ -590,23 +590,12 @@ BOOL OnCreate(HWND hWnd)
TabCtrl_SetCurFocus/*Sel*/(hTabWnd, 2); TabCtrl_SetCurFocus/*Sel*/(hTabWnd, 2);
TabCtrl_SetCurFocus/*Sel*/(hTabWnd, nActivePage); TabCtrl_SetCurFocus/*Sel*/(hTabWnd, nActivePage);
if (TaskManagerSettings.UpdateSpeed == 0) if (TaskManagerSettings.UpdateSpeed == 1)
KillTimer(hWnd, 1);
else if (TaskManagerSettings.UpdateSpeed == 1)
{
KillTimer(hWnd, 1);
SetTimer(hWnd, 1, 1000, NULL); SetTimer(hWnd, 1, 1000, NULL);
}
else if (TaskManagerSettings.UpdateSpeed == 2) else if (TaskManagerSettings.UpdateSpeed == 2)
{
KillTimer(hWnd, 1);
SetTimer(hWnd, 1, 2000, NULL); SetTimer(hWnd, 1, 2000, NULL);
}
else if (TaskManagerSettings.UpdateSpeed == 4) else if (TaskManagerSettings.UpdateSpeed == 4)
{
KillTimer(hWnd, 1);
SetTimer(hWnd, 1, 4000, NULL); SetTimer(hWnd, 1, 4000, NULL);
}
/* /*
* Refresh the performance data * Refresh the performance data