Fix crash in ns_mouse_position (bug#44313)
* src/nsterm.m (ns_destroy_window): Close the window before freeing
the frame resources so we don't end up accessing the frame struct
after it's been freed.
(cherry picked from commit 18a7267c32)
This commit is contained in:
@@ -1657,6 +1657,8 @@ ns_destroy_window (struct frame *f)
|
||||
{
|
||||
NSTRACE ("ns_destroy_window");
|
||||
|
||||
check_window_system (f);
|
||||
|
||||
/* If this frame has a parent window, detach it as not doing so can
|
||||
cause a crash in GNUStep. */
|
||||
if (FRAME_PARENT_FRAME (f) != NULL)
|
||||
@@ -1667,7 +1669,7 @@ ns_destroy_window (struct frame *f)
|
||||
[parent removeChildWindow: child];
|
||||
}
|
||||
|
||||
check_window_system (f);
|
||||
[[FRAME_NS_VIEW (f) window] close];
|
||||
ns_free_frame_resources (f);
|
||||
ns_window_num--;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user