summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdel Gadllah <adel.gadllah@gmail.com>2014-02-02 11:37:25 +0100
committerAdel Gadllah <adel.gadllah@gmail.com>2014-02-02 15:16:02 +0100
commit24f5b37d6b3ef30ae339ab1ebd9b8014de64a9cd (patch)
tree1e7556893beba5866e0a1e4a4eaf7bbdc353eff4
parent2958b15a617116a6d999c6514652f151a6bd8c7a (diff)
window_actor: Remove the frame_messages timeout in destroy
Otherwise it might fire off later and cause a crash. https://bugzilla.gnome.org/show_bug.cgi?id=723468
-rw-r--r--src/compositor/meta-window-actor.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/src/compositor/meta-window-actor.c b/src/compositor/meta-window-actor.c
index 62bfbd4d..12ff76c4 100644
--- a/src/compositor/meta-window-actor.c
+++ b/src/compositor/meta-window-actor.c
@@ -1399,6 +1399,12 @@ meta_window_actor_destroy (MetaWindowActor *self)
window_type = meta_window_get_window_type (window);
meta_window_set_compositor_private (window, NULL);
+ if (priv->send_frame_messages_timer != 0)
+ {
+ g_source_remove (priv->send_frame_messages_timer);
+ priv->send_frame_messages_timer = 0;
+ }
+
/*
* We remove the window from internal lookup hashes and thus any other
* unmap events etc fail