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

(w32_hide_hourglass): Handle case where frame

Browse source 
disappeared while hourglass was displayed. (Bug #2193)
This commit is contained in:
Jason Rumney 2009-02-08 15:35:36 +00:00
parent c253eff0ae
commit 89e094286d
2 changed files with 16 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/ChangeLog
View file

@ -1,3 +1,8 @@
2009-02-08 Jason Rumney <jasonr@gnu.org>
* w32fns.c (w32_hide_hourglass): Handle case where frame
disappeared while hourglass was displayed. (Bug #2193)
2009-02-07 Andreas Schwab <schwab@suse.de>
* unexelf.c (unexec): Fix error message.

13
src/w32fns.c
View file

@ -5279,9 +5279,18 @@ w32_hide_hourglass ()
{
struct frame *f = x_window_to_frame (&one_w32_display_info,
hourglass_hwnd);
if (f)
f->output_data.w32->hourglass_p = 0;
else
/* If frame was deleted, restore to selected frame's cursor. */
f = SELECTED_FRAME ();
if (FRAME_W32_P (f))
SetCursor (f->output_data.w32->current_cursor);
else
/* No cursors on non GUI frames - restore to stock arrow cursor. */
SetCursor (w32_load_cursor (IDC_ARROW));
f->output_data.w32->hourglass_p = 0;
SetCursor (f->output_data.w32->current_cursor);
hourglass_shown_p = 0;
}
}