minecraft-pi-reborn/zenity
1
0
Fork 0
Code Pull Requests Activity

Bug #592195. This fix made the --list mode return as soon as receive an ok or cancel response

Browse Source 
avoiding crash.
This commit is contained in:
Arx Cruz 2011-07-26 10:08:31 -03:00
parent 1fc74904e2
commit 7a34df3041
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/tree.c
View File

@ -39,6 +39,7 @@ static gchar *separator;
static gboolean print_all_columns = FALSE; static gboolean print_all_columns = FALSE;
static gint *print_columns = NULL; static gint *print_columns = NULL;
static gint *hide_columns = NULL; static gint *hide_columns = NULL;
static GIOChannel *channel;
static int *zenity_tree_extract_column_indexes (char *indexes, gint n_columns); static int *zenity_tree_extract_column_indexes (char *indexes, gint n_columns);
static gboolean zenity_tree_column_is_hidden (gint column_index); static gboolean zenity_tree_column_is_hidden (gint column_index);
@ -125,7 +126,10 @@ zenity_tree_handle_stdin (GIOChannel *channel,
gint status; gint status;
do { do {
status = g_io_channel_read_line_string (channel, string, NULL, &error); if (channel->is_readable == TRUE)
status = g_io_channel_read_line_string (channel, string, NULL, &error);
else
return FALSE;
while (gtk_events_pending ()) while (gtk_events_pending ())
gtk_main_iteration (); gtk_main_iteration ();
@ -196,8 +200,6 @@ zenity_tree_fill_entries_from_stdin (GtkTreeView *tree_view,
gboolean toggles, gboolean toggles,
gboolean editable) gboolean editable)
{ {
GIOChannel *channel;
g_object_set_data (G_OBJECT (tree_view), "n_columns", GINT_TO_POINTER (n_columns)); g_object_set_data (G_OBJECT (tree_view), "n_columns", GINT_TO_POINTER (n_columns));
g_object_set_data (G_OBJECT (tree_view), "toggles", GINT_TO_POINTER (toggles)); g_object_set_data (G_OBJECT (tree_view), "toggles", GINT_TO_POINTER (toggles));
g_object_set_data (G_OBJECT (tree_view), "editable", GINT_TO_POINTER (editable)); g_object_set_data (G_OBJECT (tree_view), "editable", GINT_TO_POINTER (editable));
@ -628,6 +630,9 @@ zenity_tree_dialog_response (GtkWidget *widget, int response, gpointer data)
zen_data->exit_code = zenity_util_return_exit_code (ZENITY_ESC); zen_data->exit_code = zenity_util_return_exit_code (ZENITY_ESC);
break; break;
} }
if (channel != NULL)
g_io_channel_shutdown (channel, TRUE, NULL);
gtk_main_quit (); gtk_main_quit ();
} }