40 lines
1.2 KiB
Diff
40 lines
1.2 KiB
Diff
From 260cb066811d2d806600030ff1c9ca53bc1880c2 Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?Guido=20G=C3=BCnther?= <agx@sigxcpu.org>
|
|
Date: Fri, 26 Nov 2021 09:54:04 +0100
|
|
Subject: [PATCH] swipe-tracker: Guard all swipeable access with NULL
|
|
|
|
This avoids a
|
|
|
|
GLib-GObject-FATAL-CRITICAL: g_object_set_data: assertion 'G_IS_OBJECT (object)' failed
|
|
|
|
when the weak ref is already gone.
|
|
---
|
|
src/hdy-swipe-tracker.c | 6 +++---
|
|
1 file changed, 3 insertions(+), 3 deletions(-)
|
|
|
|
diff --git a/src/hdy-swipe-tracker.c b/src/hdy-swipe-tracker.c
|
|
index 03b41781..ba01bd05 100644
|
|
--- a/src/hdy-swipe-tracker.c
|
|
+++ b/src/hdy-swipe-tracker.c
|
|
@@ -944,14 +944,14 @@ hdy_swipe_tracker_dispose (GObject *object)
|
|
{
|
|
HdySwipeTracker *self = HDY_SWIPE_TRACKER (object);
|
|
|
|
- if (self->swipeable)
|
|
+ if (self->swipeable) {
|
|
gtk_grab_remove (GTK_WIDGET (self->swipeable));
|
|
+ g_object_set_data (G_OBJECT (self->swipeable), "captured-event-handler", NULL);
|
|
+ }
|
|
|
|
if (self->touch_gesture)
|
|
g_signal_handlers_disconnect_by_data (self->touch_gesture, self);
|
|
|
|
- g_object_set_data (G_OBJECT (self->swipeable), "captured-event-handler", NULL);
|
|
-
|
|
g_clear_pointer (&self->event_history, g_array_unref);
|
|
g_clear_object (&self->touch_gesture);
|
|
set_swipeable (self, NULL);
|
|
--
|
|
GitLab
|
|
|