github/electron
1
1
Fork 0
mirror of https://github.com/electron/electron.git synced 2026-04-10 03:01:51 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix: keep references to active menus created by api Menu (#22152)

Browse Source 
Without this such menus would be destroyed by js garbage collector even
when they are still displayed.

Co-authored-by: CezaryKulakowski <50166166+CezaryKulakowski@users.noreply.github.com>
This commit is contained in:
Shelley Vohr
2020-02-11 19:42:35 +00:00
committed by GitHub
parent dde1ddade9
commit 1498f7c24b
1 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
atom/browser/api/atom_api_menu.cc
View File

@@ -4,6 +4,7 @@
#include "atom/browser/api/atom_api_menu.h"
#include <map>
#include <utility>
#include "atom/browser/native_window.h"
@@ -16,6 +17,13 @@
#include "native_mate/dictionary.h"
#include "native_mate/object_template_builder.h"
namespace {
// We need this map to keep references to currently opened menus.
// Without this menus would be destroyed by js garbage collector
// even when they are still displayed.
std::map<uint32_t, v8::Global<v8::Object>> g_menus;
} // unnamed namespace
namespace atom {
namespace api {
@@ -194,10 +202,12 @@ bool Menu::WorksWhenHiddenAt(int index) const {
}
void Menu::OnMenuWillClose() {
g_menus.erase(weak_map_id());
Emit("menu-will-close");
}
void Menu::OnMenuWillShow() {
g_menus[weak_map_id()] = v8::Global<v8::Object>(isolate(), GetWrapper());
Emit("menu-will-show");
}