Mercurial > vim

diff src/os_win32.c @ 6249:7816c24ff890 v7.4.459

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
updated for version 7.4.459 Problem: Can't change the icon after building Vim. Solution: Load the icon from a file on startup. (Yasuhiro Matsumoto)
author Bram Moolenaar <bram@vim.org>
date Tue, 23 Sep 2014 21:53:41 +0200
parents 59cd2b16f718
children 452e8b2a0ab3
line wrap: on
line diff
--- 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;
 }