Skip to content

Commit

Permalink
Avoid double-deletion
Browse files Browse the repository at this point in the history
Fixes other assertions
  • Loading branch information
Riteo committed Jan 19, 2025
1 parent d252c02 commit a0c005d
Showing 1 changed file with 0 additions and 2 deletions.
2 changes: 0 additions & 2 deletions platform/linuxbsd/wayland/display_server_wayland.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -706,7 +706,6 @@ void DisplayServerWayland::delete_sub_window(WindowID p_window_id) {
if (window_get_flag(WINDOW_FLAG_POPUP_WM_HINT, p_window_id)) {
WindowID top_popup = root_wd.popup_stack.back()->get();
while (top_popup != p_window_id) {
delete_sub_window(top_popup);
_send_window_event(WINDOW_EVENT_FORCE_CLOSE, top_popup);

top_popup = root_wd.popup_stack.back()->get();
Expand Down Expand Up @@ -1395,7 +1394,6 @@ void DisplayServerWayland::process_events() {

Ref<WaylandThread::PopupDoneMessage> pd_msg = msg;
if (pd_msg.is_valid()) {
delete_sub_window(pd_msg->id);
_send_window_event(WINDOW_EVENT_FORCE_CLOSE, pd_msg->id);
}

Expand Down

0 comments on commit a0c005d

Please sign in to comment.