patch 7.4.1496

Problem:    Crash when built with GUI but it's not active. (Dominique Pelle)
Solution:   Check gui.in_use.

diff --git a/src/channel.c b/src/channel.c
index da13f962c4093963fae2f813493d93a154d56d32..6ede9160df3f6de9f9863d5bf7028f480cf276ff 100644 (file)
--- a/src/channel.c
+++ b/src/channel.c
@@ -1046,8 +1046,11 @@ invoke_callback(channel_T *channel, char_u *callback, typval_T *argv)
     cursor_on();
     out_flush();
 #ifdef FEAT_GUI
-    gui_update_cursor(TRUE, FALSE);
-    gui_mch_flush();
+    if (gui.in_use)
+    {
+       gui_update_cursor(TRUE, FALSE);
+       gui_mch_flush();
+    }
 #endif
 }
 

diff --git a/src/version.c b/src/version.c
index 437e5f6cfd5e4da8054409a9777b661223e6de69..fa036f614117bf836a32045650b575c33766d47d 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -743,6 +743,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1496,
 /**/
     1495,
 /**/