summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Stahl <mstahl@redhat.com>2016-04-13 18:22:49 +0200
committerMichael Stahl <mstahl@redhat.com>2016-04-13 18:40:53 +0200
commit9a31442171cf8bd79574c318d91ef220ee7389bb (patch)
tree07a547fdc20b631b925fb2c2b9ca7fabd89393d7
parent49d320c6202a569f996c27fd824239f5f1f8a036 (diff)
vcl: fix valgrind warning in g_lo_action_group_query_action
Change-Id: I0755254d4d6d24689d4f5b39c3a6c9a29ae53b99
-rw-r--r--vcl/unx/gtk/gloactiongroup.cxx13
1 files changed, 9 insertions, 4 deletions
diff --git a/vcl/unx/gtk/gloactiongroup.cxx b/vcl/unx/gtk/gloactiongroup.cxx
index 110e0dceb418..f7b7bb03740b 100644
--- a/vcl/unx/gtk/gloactiongroup.cxx
+++ b/vcl/unx/gtk/gloactiongroup.cxx
@@ -153,6 +153,15 @@ g_lo_action_group_query_action (GActionGroup *group,
GLOActionGroup *lo_group = G_LO_ACTION_GROUP (group);
GLOAction* action;
+ if (enabled)
+ {
+ GtkSalFrame* pFrame = lo_group->priv->frame;
+ if (pFrame) {
+ pFrame->EnsureDbusMenuSynced();
+ }
+ }
+
+ // note: EnsureDbusMenuSynced could have deleted the action!
action = G_LO_ACTION (g_hash_table_lookup (lo_group->priv->table, action_name));
if (action == nullptr)
@@ -160,10 +169,6 @@ g_lo_action_group_query_action (GActionGroup *group,
if (enabled)
{
- GtkSalFrame* pFrame = lo_group->priv->frame;
- if (pFrame) {
- pFrame->EnsureDbusMenuSynced();
- }
*enabled = action->enabled;
}