From f0fdba8ad36010280fc84c2425010c195b76562a Mon Sep 17 00:00:00 2001 From: Dana Jansens Date: Wed, 9 May 2007 00:11:06 +0000 Subject: fix no more crashing in the client menu. --- openbox/menuframe.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'openbox/menuframe.c') diff --git a/openbox/menuframe.c b/openbox/menuframe.c index 6ca876fa..a2760aa1 100644 --- a/openbox/menuframe.c +++ b/openbox/menuframe.c @@ -1169,13 +1169,16 @@ void menu_entry_frame_execute(ObMenuEntryFrame *self, guint state, Time time) gpointer data = self->frame->menu->data; GSList *acts = self->entry->data.normal.actions; ObClient *client = self->frame->client; + ObMenuFrame *frame = self->frame; /* release grabs before executing the shit */ - if (!(state & ControlMask)) + if (!(state & ControlMask)) { menu_frame_hide_all(); + frame = NULL; + } if (func) - func(entry, state, data, time); + func(entry, frame, client, state, data, time); else action_run(acts, client, state, time); } -- cgit v1.2.3