diff options
| author | Ken Takata <kentkt@csc.jp> | 2024-07-29 20:57:19 +0200 |
|---|---|---|
| committer | Christian Brabandt <cb@256bit.org> | 2024-07-29 20:57:19 +0200 |
| commit | baaf6deb957e11227c6ffa5e22b48d9082ae7e77 (patch) | |
| tree | b1ee0782822a33d14850c43243e2739b27a6c4c4 | |
| parent | 011f2223e5df68f45a382f6a9dff6eaf5ecac346 (diff) | |
patch 9.1.0641: MS-Windows: OLE enabled in console versionv9.1.0641
Problem: MS-Windows: OLE enabled in console version, may cause hang
(Linda_pp)
Solution: Disable OLE for console version (Ken Takata)
If VIMDLL was enabled, a message box for registering OLE might be shown
even if Vim was executed in a console. (See #15372)
Enabling OLE in a console is not so useful. Disable it.
fixes: #15372
closes: #15385
Signed-off-by: Ken Takata <kentkt@csc.jp>
Signed-off-by: Christian Brabandt <cb@256bit.org>
| -rw-r--r-- | src/gui_w32.c | 3 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 5 insertions, 0 deletions
diff --git a/src/gui_w32.c b/src/gui_w32.c index 721c4480d5..78f252a8b7 100644 --- a/src/gui_w32.c +++ b/src/gui_w32.c @@ -5522,6 +5522,9 @@ gui_mch_prepare(int *argc, char **argv) } #ifdef FEAT_OLE +# ifdef VIMDLL + if (mch_is_gui_executable()) +# endif { int bDoRestart = FALSE; diff --git a/src/version.c b/src/version.c index 53c1118937..8afbd01487 100644 --- a/src/version.c +++ b/src/version.c @@ -705,6 +705,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 641, +/**/ 640, /**/ 639, |