From e8ce3cdd4393310a23348f5b0fe468820bb6fd9f Mon Sep 17 00:00:00 2001 From: Campbell Jones Date: Mon, 3 Jun 2024 19:53:04 -0400 Subject: [PATCH] xw_set_geo_notify: Check if grabbed view is null first --- src/surface/xwayland_view.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/surface/xwayland_view.cpp b/src/surface/xwayland_view.cpp index 748046032..2f75ee03c 100644 --- a/src/surface/xwayland_view.cpp +++ b/src/surface/xwayland_view.cpp @@ -68,7 +68,8 @@ static void xwayland_surface_request_configure_notify(wl_listener* listener, voi static void xwayland_surface_set_geometry_notify(wl_listener* listener, [[maybe_unused]] void* data) { XWaylandView& view = magpie_container_of(listener, view, set_geometry); - if (view.server.grabbed_view.lock()->get_wlr_surface() != view.get_wlr_surface()) { + auto grabbed_view = view.server.grabbed_view.lock(); + if (grabbed_view != nullptr && grabbed_view->get_wlr_surface() != view.get_wlr_surface()) { const wlr_xwayland_surface& surface = view.wlr; if (view.curr_placement == VIEW_PLACEMENT_STACKING) { view.previous = view.current;