vte r2090 - in trunk: . src

[cpwilson svn gnome org]

Author: cpwilson
Date: Mon Sep  1 11:14:44 2008
New Revision: 2090
URL: http://svn.gnome.org/viewvc/vte?rev=2090&view=rev

Log:
2008-08-20  SÃbastien Granjoux  <seb sfo free fr>

	Bug 538344 â Anjuta hangs when program is executed in terminal

	* src/vte.c: Ensure the output channel exists when we need to write.



Modified:
   trunk/ChangeLog
   trunk/src/vte.c

Modified: trunk/src/vte.c
==============================================================================
--- trunk/src/vte.c	(original)
+++ trunk/src/vte.c	Mon Sep  1 11:14:44 2008
@@ -3171,7 +3171,8 @@
 _vte_terminal_connect_pty_write(VteTerminal *terminal)
 {
 	if (terminal->pvt->pty_channel == NULL) {
-		return;
+		terminal->pvt->pty_channel =
+			g_io_channel_unix_new(terminal->pvt->pty_master);
 	}
 
 	if (terminal->pvt->pty_output_source == VTE_INVALID_SOURCE) {
@@ -3238,10 +3239,12 @@
 	/* Close any existing ptys. */
 	if (terminal->pvt->pty_channel != NULL) {
 		g_io_channel_unref (terminal->pvt->pty_channel);
+		terminal->pvt->pty_channel = NULL;
 	}
 	if (terminal->pvt->pty_master != -1) {
 		_vte_pty_close(terminal->pvt->pty_master);
 		close(terminal->pvt->pty_master);
+		terminal->pvt->pty_master = -1;
 	}
 
 	/* Open the new pty. */