From: Eli Zaretskii <eliz@gnu.org>
Date: Mon, 29 Jan 2001 12:36:52 +0000 (+0000)
Subject: (x_draw_row_bitmaps): Delay obtaining HDC to avoid returning without
X-Git-Tag: emacs-pretest-21.0.97~47
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=fccb8288473eb856cdb824162af27fb85e8ba614;p=emacs.git

(x_draw_row_bitmaps): Delay obtaining HDC to avoid returning without
releasing it.
---

diff --git a/src/ChangeLog b/src/ChangeLog
index 82003628dfa..54e6e6f0c18 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2001-01-29  Jason Rumney  <jasonr@gnu.org>
+
+	w32term.c (x_draw_row_bitmaps): Delay obtaining HDC to avoid
+	returning without releasing it.
+
 2001-01-29  Kenichi Handa  <handa@etl.go.jp>
 
 	* w32fns.c (w32_font_match): Allocate three more bytes to regex
diff --git a/src/w32term.c b/src/w32term.c
index 0d6f8c4bf20..6756cfa105f 100644
--- a/src/w32term.c
+++ b/src/w32term.c
@@ -898,7 +898,7 @@ x_draw_row_bitmaps (w, row)
   enum bitmap_type bitmap;
   struct face *face;
   int header_line_height = -1;
-  HDC hdc = get_frame_dc (f);
+  HDC hdc;
 
   xassert (interrupt_input_blocked);
 
@@ -922,6 +922,8 @@ x_draw_row_bitmaps (w, row)
   else
     bitmap = NO_BITMAP;
 
+  hdc = get_frame_dc (f);
+
   /* Clear flags area if no bitmap to draw or if bitmap doesn't fill
      the flags area.  */
   if (bitmap == NO_BITMAP