From b6c0a3f60c095bebc1cb1843d939477317e1b643 Mon Sep 17 00:00:00 2001 From: Alex Shvartzkop Date: Mon, 18 Sep 2023 17:42:09 +0300 Subject: [PATCH] Wayland: slightly better infinite drag release logic. --- libs/kiplatform/gtk/ui.cpp | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/libs/kiplatform/gtk/ui.cpp b/libs/kiplatform/gtk/ui.cpp index 8fc7120a43..708ef598e7 100644 --- a/libs/kiplatform/gtk/ui.cpp +++ b/libs/kiplatform/gtk/ui.cpp @@ -539,16 +539,17 @@ void KIPLATFORM::UI::InfiniteDragReleaseWindow() { wxLogTrace( traceWayland, wxS( "InfiniteDragReleaseWindow" ) ); - if( s_wl_confined_pointer == NULL ) + if( s_wl_confined_pointer ) { - return; + zwp_confined_pointer_v1_destroy( s_wl_confined_pointer ); + s_wl_confined_pointer = NULL; } - zwp_confined_pointer_v1_destroy( s_wl_confined_pointer ); - wl_region_destroy( s_wl_confinement_region ); - - s_wl_confined_pointer = NULL; - s_wl_confinement_region = NULL; + if( s_wl_confinement_region ) + { + wl_region_destroy( s_wl_confinement_region ); + s_wl_confinement_region = NULL; + } };