* src/w32term.c (x_delete_display): Don't free dpyinfo->w32_id_name (see bug#17510).

48e64ea6 · Ken Brown · 858e55f4 · 48e64ea6 · 48e64ea6
Commit 48e64ea6 authored May 26, 2014 by Ken Brown
Show whitespace changes
Inline Side-by-side

Showing with 5 additions and 6 deletions

src/ChangeLog src/ChangeLog +5 -0

src/w32term.c src/w32term.c +0 -6

No files found.
--- a/src/ChangeLog
+++ b/src/ChangeLog
+2014-05-26  Ken Brown  <kbrown@cornell.edu>
+
+	* w32term.c (x_delete_display): Don't free dpyinfo->w32_id_name,
+	even if !CYGWIN (see bug#17510).
+
 2014-05-26  Jan Djärv  <jan.h.d@swipnet.se>

 	* nsfns.m (Fns_do_applescript): Surround NSApp run

--- a/src/w32term.c
+++ b/src/w32term.c
@@ -6419,12 +6419,6 @@ x_delete_display (struct w32_display_info *dpyinfo)
    if (dpyinfo->palette)
      DeleteObject (dpyinfo->palette);
  }
-  /* Avoid freeing dpyinfo->w32_id_name more than once if emacs is
-     running as a daemon; see bug#17510. */
-#ifndef CYGWIN
-  xfree (dpyinfo->w32_id_name);
-#endif
-
  w32_reset_fringes ();
 }