diff options
| author | Glenn Morris <rgm@gnu.org> | 2014-05-25 19:28:09 -0700 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2014-05-25 19:28:09 -0700 |
| commit | 015936fba1bcaa51b7886a73144d4c088200c0aa (patch) | |
| tree | c9628339352c1a97e574df28966e977143c43e41 /src/w32term.c | |
| parent | 5e26d9849a79bf78fda821979fc937f7e5e6df52 (diff) | |
| parent | e8f2cc26e712f42f6391fa52cd67c3e791096f1e (diff) | |
| download | emacs-015936fba1bcaa51b7886a73144d4c088200c0aa.tar.gz | |
Merge from emacs-24; up to 2014-05-26T10:21:18Z!rgm@gnu.org
Diffstat (limited to 'src/w32term.c')
| -rw-r--r-- | src/w32term.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/w32term.c b/src/w32term.c index aa65af4afd3..8ca023a86cb 100644 --- a/src/w32term.c +++ b/src/w32term.c @@ -6419,7 +6419,11 @@ 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 (); } |