Permalink
Browse files

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)
  • Loading branch information...
1 parent a6b7a08 commit 717e196060d946fe20bb0f0307f417dc4d0e9b17 @brammool brammool committed Aug 10, 2016
Showing with 11 additions and 6 deletions.
  1. +1 −1 src/gui.c
  2. +7 −4 src/gui_gtk_x11.c
  3. +1 −1 src/proto/gui_gtk_x11.pro
  4. +2 −0 src/version.c
View
@@ -447,7 +447,7 @@ gui_init_check(void)
* See gui_do_fork().
* Use a simpler check if the GUI window can probably be opened.
*/
- result = gui.dofork ? gui_mch_early_init_check() : gui_mch_init_check();
+ result = gui.dofork ? gui_mch_early_init_check(TRUE) : gui_mch_init_check();
# else
result = gui_mch_init_check();
# endif
View
@@ -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;
@@ -6,7 +6,7 @@ int gui_mch_is_blink_off(void);
void gui_mch_set_blinking(long waittime, long on, long off);
void gui_mch_stop_blink(void);
void gui_mch_start_blink(void);
-int gui_mch_early_init_check(void);
+int gui_mch_early_init_check(int give_message);
int gui_mch_init_check(void);
void gui_mch_show_tabline(int showit);
int gui_mch_showing_tabline(void);
View
@@ -764,6 +764,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 2193,
+/**/
2192,
/**/
2191,

0 comments on commit 717e196

Please sign in to comment.