Commit a2addb04 authored by Tassilo Horn's avatar Tassilo Horn
Browse files

Work around GTK bug crashing emacs GTK builds.

* frame.c (delete_frame): Don't delete the terminal when the last
X frame is closed if emacs is built with GTK toolkit.
parent 3ed8598c
2011-11-18 Tassilo Horn <tassilo@member.fsf.org>
* frame.c (delete_frame): Don't delete the terminal when the last
X frame is closed if emacs is built with GTK toolkit.
2011-11-17 Juanma Barranquero <lekktu@gmail.com>
* window.c (syms_of_window) <window-combination-resize>: Fix typo.
......
......@@ -1359,6 +1359,13 @@ delete_frame (Lisp_Object frame, Lisp_Object force)
/* If needed, delete the terminal that this frame was on.
(This must be done after the frame is killed.) */
terminal->reference_count--;
#ifdef USE_GTK
/* FIXME: Deleting the terminal crashes emacs because of a GTK
bug.
http://lists.gnu.org/archive/html/emacs-devel/2011-10/msg00363.html */
if (terminal->reference_count == 0 && terminal->type == output_x_window)
terminal->reference_count = 1;
#endif /* USE_GTK */
if (terminal->reference_count == 0)
{
Lisp_Object tmp;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment