procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

* src/w32fns.c (w32_wnd_proc) [WM_TIMER, WM_SET_CURSOR]: Avoid using

Browse source 
frame struct members of non-existent frames.

Fixes: debbugs:6284
This commit is contained in:
Jason Rumney 2011-07-08 20:46:17 +08:00
parent 2b7f7d9992
commit 5df75e47ac
2 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/ChangeLog
View file

@ -1,3 +1,8 @@
2011-07-08 Jason Rumney <jasonr@gnu.org>
* w32fns.c (w32_wnd_proc) [WM_TIMER, WM_SET_CURSOR]: Avoid using
frame struct members of non-existent frames (Bug#6284).
2011-07-08 Jan Djärv <jan.h.d@swipnet.se>
* nsterm.m (keyDown): Call to wantsToDelayTextChangeNotifications and

9
src/w32fns.c
View file

@ -3273,7 +3273,8 @@ w32_wnd_proc (HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
{
/* Free memory used by owner-drawn and help-echo strings. */
w32_free_menu_strings (hwnd);
f->output_data.w32->menubar_active = 0;
if (f)
f->output_data.w32->menubar_active = 0;
menubar_in_use = 0;
}
}
@ -3623,10 +3624,10 @@ w32_wnd_proc (HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
if (LOWORD (lParam) == HTCLIENT)
{
f = x_window_to_frame (dpyinfo, hwnd);
if (f->output_data.w32->hourglass_p && !menubar_in_use
&& !current_popup_menu)
if (f && f->output_data.w32->hourglass_p
&& !menubar_in_use && !current_popup_menu)
SetCursor (f->output_data.w32->hourglass_cursor);
else
else if (f)
SetCursor (f->output_data.w32->current_cursor);
return 0;
}