Prevent a deadlock on recursively grabbing the gdk_mutex.

2007-02-23  Chris Wilson  <chris@chris-wilson.co.uk>

	* src/vte.c: (vte_terminal_io_read):
		Prevent a deadlock on recursively grabbing the gdk_mutex.


svn path=/trunk/; revision=1733

2 files changed, 13 insertions, 3 deletions

diff --git a/ChangeLog b/ChangeLog
index 2d80c304..07cbbc45 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2007-02-23  Chris Wilson  <chris@chris-wilson.co.uk>
 
+	* src/vte.c: (vte_terminal_io_read):
+		Prevent a deadlock on recursively grabbing the gdk_mutex.
+
+2007-02-23  Chris Wilson  <chris@chris-wilson.co.uk>
+
 	Heuristic to avoid a read when it's likely to just return EAGAIN.
 
 	* src/vte-private.h:
diff --git a/src/vte.c b/src/vte.c
index 79d0051d..26844a84 100644
--- a/src/vte.c
+++ b/src/vte.c
@@ -3519,9 +3519,14 @@ out:
 
 	/* If we detected an eof condition, signal one. */
 	if (eof) {
-		GDK_THREADS_ENTER ();
-		vte_terminal_eof (channel, terminal);
-		GDK_THREADS_LEAVE ();
+		/* potential deadlock ... */
+		if (!vte_terminal_is_processing (terminal)) {
+			GDK_THREADS_ENTER ();
+			vte_terminal_eof (channel, terminal);
+			GDK_THREADS_LEAVE ();
+		} else {
+			vte_terminal_eof (channel, terminal);
+		}
 	}
 
 	return !eof && (!active_terminals || !active_terminals->next);