diff options
| author | Bram Moolenaar <Bram@vim.org> | 2014-09-23 21:53:41 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2014-09-23 21:53:41 +0200 |
| commit | cddc91ccb4cc0989fa0169a343289873a6d2d651 (patch) | |
| tree | 8e9efe82b872ff18875e2c2e765f4b7e501fe571 /src/os_win32.c | |
| parent | cfc216e7b00690805aef8683fab000654937191d (diff) | |
| download | vim-git-cddc91ccb4cc0989fa0169a343289873a6d2d651.tar.gz | |
updated for version 7.4.459v7.4.459
Problem: Can't change the icon after building Vim.
Solution: Load the icon from a file on startup. (Yasuhiro Matsumoto)
Diffstat (limited to 'src/os_win32.c')
| -rw-r--r-- | src/os_win32.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/os_win32.c b/src/os_win32.c index 7192c51a0..21c3ee9f4 100644 --- a/src/os_win32.c +++ b/src/os_win32.c @@ -2446,7 +2446,8 @@ SaveConsoleTitleAndIcon(void) return; /* Extract the first icon contained in the Vim executable. */ - g_hVimIcon = ExtractIcon(NULL, exe_name, 0); + if (mch_icon_load((HANDLE *)&g_hVimIcon) == FAIL || g_hVimIcon == NULL) + g_hVimIcon = ExtractIcon(NULL, exe_name, 0); if (g_hVimIcon != NULL) g_fCanChangeIcon = TRUE; } |