projects
/
mikachu
/
openbox.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
(from parent 1:
ad96eba
)
Merge branch 'backport' into 3.4-working
author
Dana Jansens
<danakj@orodu.net>
Thu, 7 Jan 2010 18:26:28 +0000
(13:26 -0500)
committer
Dana Jansens
<danakj@orodu.net>
Thu, 7 Jan 2010 18:26:28 +0000
(13:26 -0500)
openbox/menuframe.c
patch
|
blob
|
history
diff --git
a/openbox/menuframe.c
b/openbox/menuframe.c
index
088986f
..
076fe6e
100644
(file)
--- 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