summaryrefslogtreecommitdiff
path: root/openbox
diff options
context:
space:
mode:
authorDana Jansens <danakj@orodu.net>2010-01-06 18:58:27 -0500
committerDana Jansens <danakj@orodu.net>2010-01-06 18:58:27 -0500
commitf163c46eaf01ced8405fa36a3bf4a5c488f0f5aa (patch)
tree3d0a5956baf5fa2d070bebaf3fef36327e1be9e1 /openbox
parentf3285a3d0bf118ce0eba0014ea53b11f47d710d6 (diff)
Fix a crash when moving into a menu on top of a separator and nothing is selected
Diffstat (limited to 'openbox')
-rw-r--r--openbox/menuframe.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/openbox/menuframe.c b/openbox/menuframe.c
index 088986f8..076fe6ef 100644
--- a/openbox/menuframe.c
+++ b/openbox/menuframe.c
@@ -1159,7 +1159,8 @@ void menu_frame_select(ObMenuFrame *self, ObMenuEntryFrame *entry,
if (entry && entry->entry->type == OB_MENU_ENTRY_TYPE_SEPARATOR)
entry = old;
- if (old == entry && (old->entry->type != OB_MENU_ENTRY_TYPE_SUBMENU))
+ if (old == entry &&
+ (!old || old->entry->type != OB_MENU_ENTRY_TYPE_SUBMENU))
return;
/* if the user left this menu but we have a submenu open, move the