Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-09-28 21:44:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

[MAGNIFY] Call PostQuitMessage() only at the very end.

Browse source
This commit is contained in:
Hermès Bélusca-Maïto 2018-02-11 00:35:29 +01:00
parent bd70987909
commit a3403eff05
No known key found for this signature in database
GPG key ID: 3B2539C65E7B93D0
1 changed files with 10 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
base/applications/magnify/magnifier.c
View file

@ -741,12 +741,14 @@ LRESULT CALLBACK WndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
return 0;
case WM_DESTROY:
if(AppBarConfig.uEdge>=0) DoAppBarStuff(ABM_REMOVE);
{
if (AppBarConfig.uEdge >= 0)
DoAppBarStuff(ABM_REMOVE);
KillTimer(hWnd, 1);
/* Save settings to registry */
SaveSettings();
KillTimer(hWnd , 1);
PostQuitMessage(0);
/* Cleanup notification icon */
ZeroMemory(&nid, sizeof(nid));
@ -755,11 +757,13 @@ LRESULT CALLBACK WndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
nid.hWnd = hWnd;
nid.uCallbackMessage = APPMSG_NOTIFYICON;
Shell_NotifyIcon(NIM_DELETE, &nid);
DestroyIcon(notifyIcon);
DestroyWindow(hOptionsDialog);
PostQuitMessage(0);
return 0;
}
case WM_CREATE:
{
@ -769,7 +773,7 @@ LRESULT CALLBACK WndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
hDesktopWindow = GetDesktopWindow();
/* Set the timer */
SetTimer (hWnd , 1, TIMER_SPEED , NULL);
SetTimer(hWnd, 1, TIMER_SPEED, NULL);
/* Notification icon */
notifyIcon = (HICON)LoadImage(hInst, MAKEINTRESOURCE(IDI_ICON), IMAGE_ICON, 16, 16, 0);
@ -781,7 +785,7 @@ LRESULT CALLBACK WndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
nid.uCallbackMessage = APPMSG_NOTIFYICON;
nid.hIcon = notifyIcon;
Shell_NotifyIcon(NIM_ADD, &nid);
tempMenu = LoadMenu(hInst, MAKEINTRESOURCE(IDC_MAGNIFIER));
notifyMenu = GetSubMenu(tempMenu, 0);
RemoveMenu(tempMenu, 0, MF_BYPOSITION);