diff --git a/src/Notepad3.c b/src/Notepad3.c index a31193f4a..8a05cac84 100644 --- a/src/Notepad3.c +++ b/src/Notepad3.c @@ -645,6 +645,11 @@ int WINAPI wWinMain(_In_ HINSTANCE hInstance, _In_opt_ HINSTANCE hPrevInstance, s_hRichEdit = LoadLibrary(L"MSFTEDIT.DLL"); // Use "RichEdit50W" for control in common_res.h } + if (!Globals.hDlgIcon) { + Globals.hDlgIcon = LoadImage(hInstance, MAKEINTRESOURCE(IDR_MAINWND), IMAGE_ICON, + GetSystemMetrics(SM_CXSMICON), GetSystemMetrics(SM_CYSMICON), LR_DEFAULTCOLOR); + } + // Command Line Help Dialog if (s_flagDisplayHelp) { DisplayCmdLineHelp(NULL); @@ -654,11 +659,6 @@ int WINAPI wWinMain(_In_ HINSTANCE hInstance, _In_opt_ HINSTANCE hPrevInstance, s_msgTaskbarCreated = RegisterWindowMessage(L"TaskbarCreated"); - if (!Globals.hDlgIcon) { - Globals.hDlgIcon = LoadImage(hInstance, MAKEINTRESOURCE(IDR_MAINWND), IMAGE_ICON, - GetSystemMetrics(SM_CXSMICON), GetSystemMetrics(SM_CYSMICON), LR_DEFAULTCOLOR); - } - Globals.hMainMenu = NULL; if (Globals.hLngResContainer != Globals.hInstance) { Globals.hMainMenu = LoadMenu(Globals.hLngResContainer, MAKEINTRESOURCE(IDR_MUI_MAINMENU));