adobe
diff --git a/‎appshell/appshell_extensions_win.cpp
Copy file name to clipboard
+8-6Lines changed: 8 additions & 6 deletions b/‎appshell/appshell_extensions_win.cpp
Copy file name to clipboard
+8-6Lines changed: 8 additions & 6 deletions
@@ -1175,16 +1175,17 @@ int32 getNewMenuPosition(CefRefPtr<CefBrowser> browser, const ExtensionString& p
 int32 AddMenu(CefRefPtr<CefBrowser> browser, ExtensionString itemTitle, ExtensionString command,
               ExtensionString position, ExtensionString relativeId)
 {
-    HMENU mainMenu = GetMenu((HWND)getMenuParent(browser));
+    HWND mainWindow = (HWND)getMenuParent(browser);
+    HMENU mainMenu = GetMenu(mainWindow);
     if (mainMenu == NULL) {
         mainMenu = CreateMenu();
-        SetMenu((HWND)getMenuParent(browser), mainMenu);
+        SetMenu(mainWindow, mainMenu);
     }
 
-    int32 tag = NativeMenuModel::getInstance(getMenuParent(browser)).getTag(command);
+    int32 tag = NativeMenuModel::getInstance(mainWindow).getTag(command);
     if (tag == kTagNotFound) {
-        tag = NativeMenuModel::getInstance(getMenuParent(browser)).getOrCreateTag(command, ExtensionString());
-        NativeMenuModel::getInstance(getMenuParent(browser)).setOsItem(tag, (void*)mainMenu);
+        tag = NativeMenuModel::getInstance(mainWindow).getOrCreateTag(command, ExtensionString());
+        NativeMenuModel::getInstance(mainWindow).setOsItem(tag, (void*)mainMenu);
     } else {
         // menu is already there
         return NO_ERROR;
@@ -1221,11 +1222,12 @@ int32 AddMenu(CefRefPtr<CefBrowser> browser, ExtensionString itemTitle, Extensio
     }
     else
     {
-        int32 relativeTag = NativeMenuModel::getInstance(getMenuParent(browser)).getTag(relativeId);
+        int32 relativeTag = NativeMenuModel::getInstance(mainWindow).getTag(relativeId);
         if (!InsertMenuItem(mainMenu, relativeTag, FALSE, &menuInfo)) {
             return ConvertErrnoCode(GetLastError());
         }
     }
+    ::SendMessage(mainWindow, WM_USER+1004, 0, 0);
     return errCode;
 }
Original file line number	Diff line number	Diff line change
`@@ -1175,16 +1175,17 @@ int32 getNewMenuPosition(CefRefPtr<CefBrowser> browser, const ExtensionString& p`
`1175`	`1175`	`int32 AddMenu(CefRefPtr<CefBrowser> browser, ExtensionString itemTitle, ExtensionString command,`
`1176`	`1176`	`ExtensionString position, ExtensionString relativeId)`
`1177`	`1177`	`{`
`1178`		`- HMENU mainMenu = GetMenu((HWND)getMenuParent(browser));`
	`1178`	`+ HWND mainWindow = (HWND)getMenuParent(browser);`
	`1179`	`+ HMENU mainMenu = GetMenu(mainWindow);`
`1179`	`1180`	`if (mainMenu == NULL) {`
`1180`	`1181`	`mainMenu = CreateMenu();`
`1181`		`- SetMenu((HWND)getMenuParent(browser), mainMenu);`
	`1182`	`+ SetMenu(mainWindow, mainMenu);`
`1182`	`1183`	`}`
`1183`	`1184`
`1184`		`- int32 tag = NativeMenuModel::getInstance(getMenuParent(browser)).getTag(command);`
	`1185`	`+ int32 tag = NativeMenuModel::getInstance(mainWindow).getTag(command);`
`1185`	`1186`	`if (tag == kTagNotFound) {`
`1186`		`- tag = NativeMenuModel::getInstance(getMenuParent(browser)).getOrCreateTag(command, ExtensionString());`
`1187`		`- NativeMenuModel::getInstance(getMenuParent(browser)).setOsItem(tag, (void*)mainMenu);`
	`1187`	`+ tag = NativeMenuModel::getInstance(mainWindow).getOrCreateTag(command, ExtensionString());`
	`1188`	`+ NativeMenuModel::getInstance(mainWindow).setOsItem(tag, (void*)mainMenu);`
`1188`	`1189`	`} else {`
`1189`	`1190`	`// menu is already there`
`1190`	`1191`	`return NO_ERROR;`
`@@ -1221,11 +1222,12 @@ int32 AddMenu(CefRefPtr<CefBrowser> browser, ExtensionString itemTitle, Extensio`
`1221`	`1222`	`}`
`1222`	`1223`	`else`
`1223`	`1224`	`{`
`1224`		`- int32 relativeTag = NativeMenuModel::getInstance(getMenuParent(browser)).getTag(relativeId);`
	`1225`	`+ int32 relativeTag = NativeMenuModel::getInstance(mainWindow).getTag(relativeId);`
`1225`	`1226`	`if (!InsertMenuItem(mainMenu, relativeTag, FALSE, &menuInfo)) {`
`1226`	`1227`	`return ConvertErrnoCode(GetLastError());`
`1227`	`1228`	`}`
`1228`	`1229`	`}`
	`1230`	`+ ::SendMessage(mainWindow, WM_USER+1004, 0, 0);`
`1229`	`1231`	`return errCode;`
`1230`	`1232`	`}`
`1231`	`1233`