[Emacs-diffs] emacs/src w32fns.c

[Jason Rumney]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Jason Rumney <jasonr>   09/02/08 15:34:39

Modified files:
        src            : w32fns.c 

Log message:
        (w32_hide_hourglass): Handle case where frame
        disappeared while hourglass was displayed. (Bug #2193)

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/src/w32fns.c?cvsroot=emacs&r1=1.354&r2=1.355

Patches:
Index: w32fns.c
===================================================================
RCS file: /sources/emacs/emacs/src/w32fns.c,v
retrieving revision 1.354
retrieving revision 1.355
diff -u -b -r1.354 -r1.355
--- w32fns.c    18 Jan 2009 03:58:10 -0000      1.354
+++ w32fns.c    8 Feb 2009 15:34:38 -0000       1.355
@@ -5279,9 +5279,18 @@
     {
       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));
+
       hourglass_shown_p = 0;
     }
 }