berkus
/
essence-os
mirror of https://gitlab.com/nakst/essence
1
0
Fork 0
Code Releases Activity

gui: open instance references for menus

This commit is contained in:
nakst 2022-02-14 09:44:26 +00:00
parent 8f411e35b7
commit 77cf096b39
1 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
desktop/gui.cpp
View File

@ -916,7 +916,15 @@ EsWindow *EsWindowCreate(EsInstance *instance, EsWindowStyle style) {
return nullptr; return nullptr;
} }
window->instance = instance; if (instance) {
window->instance = instance;
if (style == ES_WINDOW_NORMAL) {
// A handle to the instance is already open.
} else {
EsInstanceOpenReference(instance);
}
}
if (style == ES_WINDOW_NORMAL) { if (style == ES_WINDOW_NORMAL) {
window->handle = ((APIInstance *) instance->_private)->mainWindowHandle; window->handle = ((APIInstance *) instance->_private)->mainWindowHandle;
@ -7736,8 +7744,11 @@ void UIProcessWindowManagerMessage(EsWindow *window, EsMessage *message, Process
// Check if the window has been destroyed. // Check if the window has been destroyed.
if (message->type == ES_MSG_WINDOW_DESTROYED) { if (message->type == ES_MSG_WINDOW_DESTROYED) {
if (window->instance && window->instance->window == window) { if (window->instance) {
window->instance->window = nullptr; if (window->instance->window == window) {
window->instance->window = nullptr;
}
EsInstanceCloseReference(window->instance); EsInstanceCloseReference(window->instance);
} }