From 4bbf6d497d34793693e5ac24fbe23854b481002b Mon Sep 17 00:00:00 2001 From: Sebastian Keller Date: Mon, 17 Apr 2023 13:38:23 +0200 Subject: [PATCH] windowPreview: Ignore leave events after being destroyed When a WindowPreview is being destroyed, the class default handler for the `destroy` signal is responsible for destroying its child actors. This happens after the emission of the `destroy` signal, i.e. after `WindowPreview::_onDestroy()` has been run. The destruction of the WindowPreview's child actors now triggers a re-pick, but due to WindowPreview having already being marked as `CLUTTER_IN_DESTRUCTION`, it will not be picked, resulting in a `leave` event if the cursor was on top of the WindowPreview at the time `destroy()` was called on it. So this leads to `WindowPreview::vfunc_leave_event()` being run after `WindowPreview::_onDestroy()`, which means the idle started by the leave event handler will not be removed and ends up accessing actors after they have already been destroyed. Closes: https://gitlab.gnome.org/GNOME/gnome-shell/-/issues/5512 Closes: https://gitlab.gnome.org/GNOME/gnome-shell/-/issues/6065 Part-of: --- js/ui/windowPreview.js | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/js/ui/windowPreview.js b/js/ui/windowPreview.js index 9f4c9d2de..ab851c6a7 100644 --- a/js/ui/windowPreview.js +++ b/js/ui/windowPreview.js @@ -525,6 +525,7 @@ var WindowPreview = GObject.registerClass({ _onDestroy() { this.metaWindow._delegate = null; this._delegate = null; + this._destroyed = true; if (this._longPressLater) { const laters = global.compositor.get_laters(); @@ -554,6 +555,9 @@ var WindowPreview = GObject.registerClass({ } vfunc_leave_event(crossingEvent) { + if (this._destroyed) + return super.vfunc_leave_event(crossingEvent); + if ((crossingEvent.flags & Clutter.EventFlags.FLAG_GRAB_NOTIFY) !== 0 && global.stage.get_grab_actor() === this._closeButton) return super.vfunc_leave_event(crossingEvent);