patch 8.1.1369: get E484 when using system() during GUI startup

Problem:    Get E484 when using system() during GUI startup.
Solution:   Check "gui.starting". (Ken Takata)

diff --git a/src/os_win32.c b/src/os_win32.c
index 54ca4de7d4025c1b84a25e7aa16dbddac32d6f95..33d48cf7fa7a95e50714b595a7b44709a6f542a4 100644 (file)
--- a/src/os_win32.c
+++ b/src/os_win32.c
@@ -2762,7 +2762,7 @@ mch_init(void)
 mch_exit(int r)
 {
 #ifdef VIMDLL
-    if (gui.starting || gui.in_use)
+    if (gui.in_use || gui.starting)
        mch_exit_g(r);
     else
        mch_exit_c(r);
@@ -4500,7 +4500,7 @@ mch_system_c(char *cmd, int options)
 mch_system(char *cmd, int options)
 {
 #ifdef VIMDLL
-    if (gui.in_use)
+    if (gui.in_use || gui.starting)
        return mch_system_g(cmd, options);
     else
        return mch_system_c(cmd, options);
@@ -4821,7 +4821,7 @@ mch_call_shell(
        {
            cmdlen =
 #ifdef FEAT_GUI_MSWIN
-               (gui.in_use ?
+               ((gui.in_use || gui.starting) ?
                    (!s_dont_use_vimrun && p_stmp ?
                        STRLEN(vimrun_path) : STRLEN(p_sh) + STRLEN(p_shcf))
                    : 0) +
@@ -4834,7 +4834,7 @@ mch_call_shell(
 #if defined(FEAT_GUI_MSWIN)
                if (
 # ifdef VIMDLL
-                   gui.in_use &&
+                   (gui.in_use || gui.starting) &&
 # endif
                    need_vimrun_warning)
                {
@@ -4853,7 +4853,7 @@ mch_call_shell(
                }
                if (
 # ifdef VIMDLL
-                   gui.in_use &&
+                   (gui.in_use || gui.starting) &&
 # endif
                    !s_dont_use_vimrun && p_stmp)
                    /* Use vimrun to execute the command.  It opens a console
@@ -4865,7 +4865,7 @@ mch_call_shell(
                            p_sh, p_shcf, cmd);
                else
 # ifdef VIMDLL
-               if (gui.in_use)
+               if (gui.in_use || gui.starting)
 # endif
                    vim_snprintf((char *)newcmd, cmdlen, "%s %s %s %s %s",
                                           p_sh, p_shcf, p_sh, p_shcf, cmd);
@@ -4889,7 +4889,7 @@ mch_call_shell(
     /* Print the return value, unless "vimrun" was used. */
     if (x != 0 && !(options & SHELL_SILENT) && !emsg_silent
 #if defined(FEAT_GUI_MSWIN)
-           && (gui.in_use ?
+           && ((gui.in_use || gui.starting) ?
                ((options & SHELL_DOOUT) || s_dont_use_vimrun || !p_stmp) : 1)
 #endif
            )

diff --git a/src/version.c b/src/version.c
index 6286a7a3841e2a22e63db00494fd0593ed154348..224fde2782e166f8dbbe6f69505f8270312653fa 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -767,6 +767,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1369,
 /**/
     1368,
 /**/