From 717e196060d946fe20bb0f0307f417dc4d0e9b17 Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Wed, 10 Aug 2016 21:28:44 +0200 Subject: patch 7.4.2193 Problem: With Gnome when the GUI can't start test_startup hangs. Solution: Call gui_mch_early_init_check(). (Hirohito Higashi) --- src/gui_gtk_x11.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'src/gui_gtk_x11.c') diff --git a/src/gui_gtk_x11.c b/src/gui_gtk_x11.c index 939ecde7e..7c63a49fc 100644 --- a/src/gui_gtk_x11.c +++ b/src/gui_gtk_x11.c @@ -542,8 +542,10 @@ gui_mch_prepare(int *argc, char **argv) } /* These arguments make gnome_program_init() print a message and exit. - * Must start the GUI for this, otherwise ":gui" will exit later! */ - if (option->flags & ARG_NEEDS_GUI) + * Must start the GUI for this, otherwise ":gui" will exit later! + * Only when the GUI can start. */ + if ((option->flags & ARG_NEEDS_GUI) + && gui_mch_early_init_check(FALSE) == OK) gui.starting = TRUE; if (option->flags & ARG_KEEP) @@ -1663,7 +1665,7 @@ selection_get_cb(GtkWidget *widget UNUSED, * Return OK or FAIL. */ int -gui_mch_early_init_check(void) +gui_mch_early_init_check(int give_message) { char_u *p; @@ -1672,7 +1674,8 @@ gui_mch_early_init_check(void) if (p == NULL || *p == NUL) { gui.dying = TRUE; - EMSG(_((char *)e_opendisp)); + if (give_message) + EMSG(_((char *)e_opendisp)); return FAIL; } return OK; -- cgit v1.2.1