From e14a74eee557817f4fa54f201b40c48e6ef31174 Mon Sep 17 00:00:00 2001
From: Rainer Kottenhoff <rainer.kottenhoff@gmail.com>
Date: Tue, 30 Jul 2019 14:14:34 +0200
Subject: [PATCH] + fix: load set localized menu before displaying dialog

---
 Versions/build.txt             |  2 +-
 res/Notepad3.exe.manifest.conf |  2 +-
 src/Notepad3.c                 | 18 +++++++++---------
 src/VersionEx.h                |  2 +-
 4 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/Versions/build.txt b/Versions/build.txt
index a317748d0..632921140 100644
--- a/Versions/build.txt
+++ b/Versions/build.txt
@@ -1 +1 @@
-2518
+2519
diff --git a/res/Notepad3.exe.manifest.conf b/res/Notepad3.exe.manifest.conf
index 4b01eacc2..35818c85f 100644
--- a/res/Notepad3.exe.manifest.conf
+++ b/res/Notepad3.exe.manifest.conf
@@ -3,7 +3,7 @@
   <assemblyIdentity
     name="Notepad3"
     processorArchitecture="*"
-    version="5.19.730.2518"
+    version="5.19.730.2519"
     type="win32"
   />
   <description>Notepad3 RC2</description>
diff --git a/src/Notepad3.c b/src/Notepad3.c
index daa151374..c30d79bc0 100644
--- a/src/Notepad3.c
+++ b/src/Notepad3.c
@@ -918,15 +918,6 @@ int WINAPI wWinMain(_In_ HINSTANCE hInstance, _In_opt_ HINSTANCE hPrevInstance,
     return 1; 
   }
 
-  if (Globals.hIcon128) {
-      SendMessage(hwnd, WM_SETICON, ICON_BIG, (LPARAM)Globals.hIcon128);
-  }
-  if (Globals.hDlgIcon) {
-    SendMessage(hwnd, WM_SETICON, ICON_SMALL, (LPARAM)Globals.hDlgIcon);
-  }
-
-  if (Globals.hMainMenu) { SetMenu(hwnd, Globals.hMainMenu); }
-
 #ifdef _EXTRA_DRAG_N_DROP_HANDLER_
   DragAndDropInit(NULL);
 #endif
@@ -1187,6 +1178,13 @@ HWND InitInstance(HINSTANCE hInstance,LPCWSTR pszCmdLine,int nCmdShow)
   }
   //UpdateWindowLayoutForDPI(Globals.hwndMain, 0, 0, 0, 0);
 
+  if (Globals.hIcon128) {
+    SendMessage(Globals.hwndMain, WM_SETICON, ICON_BIG, (LPARAM)Globals.hIcon128);
+  }
+  if (Globals.hDlgIcon) {
+    SendMessage(Globals.hwndMain, WM_SETICON, ICON_SMALL, (LPARAM)Globals.hDlgIcon);
+  }
+
   if (Settings.TransparentMode) {
     SetWindowTransparentMode(Globals.hwndMain, true, Settings2.OpacityLevel);
   }
@@ -1195,6 +1193,8 @@ HWND InitInstance(HINSTANCE hInstance,LPCWSTR pszCmdLine,int nCmdShow)
     SciCall_SetZoom(s_WinInfo.zoom);
   }
 
+  SetMenu(Globals.hwndMain, Globals.hMainMenu);
+
   // Current file information -- moved in front of ShowWindow()
   FileLoad(true,true,false,Settings.SkipUnicodeDetection,Settings.SkipANSICodePageDetection,false,L"");
 
diff --git a/src/VersionEx.h b/src/VersionEx.h
index c491b17b4..9b1c759ba 100644
--- a/src/VersionEx.h
+++ b/src/VersionEx.h
@@ -8,7 +8,7 @@
 #define VERSION_MAJOR 5
 #define VERSION_MINOR 19
 #define VERSION_REV 730
-#define VERSION_BUILD 2518
+#define VERSION_BUILD 2519
 #define SCINTILLA_VER 420
 #define ONIGURUMA_REGEX_VER 6.9.3
 #define VERSION_PATCH RC2