diff options
| author | wm4 <wm4@mplayer2.org> | 2012-04-14 16:53:24 +0200 |
|---|---|---|
| committer | wm4 <wm4@mplayer2.org> | 2012-04-14 17:03:11 +0200 |
| commit | 3bb456b14d4c2b8e26c5d6f7bbfe62f5e97ed58e (patch) | |
| tree | d1632f83582bd3d0211f9bc772a275aca16cfb1b /libvo | |
| parent | 923f353d2ab9fa24d3a3989c23cec88499068b77 (diff) | |
| download | mpv-3bb456b14d4c2b8e26c5d6f7bbfe62f5e97ed58e.tar.bz2 mpv-3bb456b14d4c2b8e26c5d6f7bbfe62f5e97ed58e.tar.xz | |
win32: simplify icon loading
I have no idea why the code used this roundabout method.
Also detab mplayer.rc.
Diffstat (limited to 'libvo')
| -rw-r--r-- | libvo/w32_common.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/libvo/w32_common.c b/libvo/w32_common.c index f6ebe10b81..7eaafe7c29 100644 --- a/libvo/w32_common.c +++ b/libvo/w32_common.c @@ -631,12 +631,7 @@ int vo_w32_init(struct vo *vo) HINSTANCE hInstance = GetModuleHandleW(NULL); - HICON mplayerIcon = 0; - wchar_t exedir[MAX_PATH]; - if (GetModuleFileNameW(0, exedir, MAX_PATH)) - mplayerIcon = ExtractIconW(hInstance, exedir, 0); - if (!mplayerIcon) - mplayerIcon = LoadIcon(0, IDI_APPLICATION); + HICON mplayerIcon = LoadIconW(hInstance, L"IDI_ICON1"); WNDCLASSEXW wcex = { .cbSize = sizeof wcex, |