projects
/
mikachu
/
openbox.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(from parent 1:
567fd15
)
NULL ic when we failed to load an image
author
Mikael Magnusson
<mikachu@gmail.com>
Mon, 11 Jan 2010 21:48:06 +0000
(22:48 +0100)
committer
Mikael Magnusson
<mikachu@gmail.com>
Mon, 11 Jan 2010 22:53:45 +0000
(23:53 +0100)
openbox/menu.c
patch
|
blob
|
history
diff --git
a/openbox/menu.c
b/openbox/menu.c
index
524220c
..
6dd6d07
100644
(file)
--- a/
openbox/menu.c
+++ b/
openbox/menu.c
@@
-299,8
+299,10
@@
static void parse_menu_item(xmlNodePtr node, gpointer data)
RrImageRef(ic);
else {
ic = RrImageNew(ob_rr_icons);
- if (!RrImageAddPictureName(ic, icon))
+ if (!RrImageAddPictureName(ic, icon))
{
RrImageUnref(ic); /* no need to keep it around */
+ ic = NULL;
+ }
}
e->data.normal.icon = ic;