@@ -2762,7 +2762,7 @@ mch_init(void)
2762
2762
mch_exit (int r )
2763
2763
{
2764
2764
#ifdef VIMDLL
2765
- if (gui .starting || gui .in_use )
2765
+ if (gui .in_use || gui .starting )
2766
2766
mch_exit_g (r );
2767
2767
else
2768
2768
mch_exit_c (r );
@@ -4500,7 +4500,7 @@ mch_system_c(char *cmd, int options)
4500
4500
mch_system (char * cmd , int options )
4501
4501
{
4502
4502
#ifdef VIMDLL
4503
- if (gui .in_use )
4503
+ if (gui .in_use || gui . starting )
4504
4504
return mch_system_g (cmd , options );
4505
4505
else
4506
4506
return mch_system_c (cmd , options );
@@ -4821,7 +4821,7 @@ mch_call_shell(
4821
4821
{
4822
4822
cmdlen =
4823
4823
#ifdef FEAT_GUI_MSWIN
4824
- (gui .in_use ?
4824
+ (( gui .in_use || gui . starting ) ?
4825
4825
(!s_dont_use_vimrun && p_stmp ?
4826
4826
STRLEN (vimrun_path ) : STRLEN (p_sh ) + STRLEN (p_shcf ))
4827
4827
: 0 ) +
@@ -4834,7 +4834,7 @@ mch_call_shell(
4834
4834
#if defined(FEAT_GUI_MSWIN )
4835
4835
if (
4836
4836
# ifdef VIMDLL
4837
- gui .in_use &&
4837
+ ( gui .in_use || gui . starting ) &&
4838
4838
# endif
4839
4839
need_vimrun_warning )
4840
4840
{
@@ -4853,7 +4853,7 @@ mch_call_shell(
4853
4853
}
4854
4854
if (
4855
4855
# ifdef VIMDLL
4856
- gui .in_use &&
4856
+ ( gui .in_use || gui . starting ) &&
4857
4857
# endif
4858
4858
!s_dont_use_vimrun && p_stmp )
4859
4859
/* Use vimrun to execute the command. It opens a console
@@ -4865,7 +4865,7 @@ mch_call_shell(
4865
4865
p_sh , p_shcf , cmd );
4866
4866
else
4867
4867
# ifdef VIMDLL
4868
- if (gui .in_use )
4868
+ if (gui .in_use || gui . starting )
4869
4869
# endif
4870
4870
vim_snprintf ((char * )newcmd , cmdlen , "%s %s %s %s %s" ,
4871
4871
p_sh , p_shcf , p_sh , p_shcf , cmd );
@@ -4889,7 +4889,7 @@ mch_call_shell(
4889
4889
/* Print the return value, unless "vimrun" was used. */
4890
4890
if (x != 0 && !(options & SHELL_SILENT ) && !emsg_silent
4891
4891
#if defined(FEAT_GUI_MSWIN )
4892
- & & (gui .in_use ?
4892
+ & & (( gui .in_use || gui . starting ) ?
4893
4893
((options & SHELL_DOOUT ) || s_dont_use_vimrun || !p_stmp ) : 1 )
4894
4894
#endif
4895
4895
)
0 commit comments