aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Terry <michael.terry@canonical.com>2015-04-30 19:07:45 +0000
committerCI Train Bot <ci-train-bot@canonical.com>2015-04-30 19:07:45 +0000
commit3e5d80703fbcc2a6e8b579cad92466a0ff15c712 (patch)
tree0dba9fb0a4ae10904a8eef9ee88e31aa7685e93b
parent19e49491df0dd0954c103c925ea26d7543b5c4e4 (diff)
parent1933513db4d73a9b7dfa19683351a9c37451b69a (diff)
downloadqmenumodel-3e5d80703fbcc2a6e8b579cad92466a0ff15c712.tar.gz
qmenumodel-3e5d80703fbcc2a6e8b579cad92466a0ff15c712.tar.bz2
qmenumodel-3e5d80703fbcc2a6e8b579cad92466a0ff15c712.zip
Don't leave a dangling GVariant pointer in GtkMenuTrackerItem, which can cause a crash.
Specifically, we were seeing a crash in the unity8 welcome wizard when restarting indicators after a language change. Fixes: #1450494 Approved by: PS Jenkins bot, Albert Astals Cid, Lars Uebernickel
-rw-r--r--libqmenumodel/src/gtk/gtkmenutrackeritem.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/libqmenumodel/src/gtk/gtkmenutrackeritem.c b/libqmenumodel/src/gtk/gtkmenutrackeritem.c
index 34e168a..0197701 100644
--- a/libqmenumodel/src/gtk/gtkmenutrackeritem.c
+++ b/libqmenumodel/src/gtk/gtkmenutrackeritem.c
@@ -400,6 +400,7 @@ gtk_menu_tracker_item_action_removed (GtkActionObserver *observer,
if (self->action_state != NULL)
{
g_variant_unref (self->action_state);
+ self->action_state = NULL;
g_object_notify_by_pspec (G_OBJECT (self), gtk_menu_tracker_item_pspecs[PROP_ACTION_STATE]);
}