From: Dana Jansens <danakj@orodu.net>
Date: Sun, 21 Sep 2003 16:42:15 +0000 (+0000)
Subject: dont add null actions to the list
X-Git-Url: https://git.brokenzipper.com/gitweb?a=commitdiff_plain;h=0cceca230318a63daa9ec896575379046f5d3a49;p=chaz%2Fopenbox

dont add null actions to the list
---

diff --git a/openbox/menu.c b/openbox/menu.c
index e1a2e6d8..cf3fa555 100644
--- a/openbox/menu.c
+++ b/openbox/menu.c
@@ -176,10 +176,12 @@ static void parse_menu_item(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node,
             GSList *acts = NULL;
 
             for (node = node->children; node; node = node->next)
-                if (!xmlStrcasecmp(node->name, (const xmlChar*) "action"))
-                    acts = g_slist_append(acts, action_parse
-                                          (i, doc, node,
-                                           OB_USER_ACTION_MENU_SELECTION));
+                if (!xmlStrcasecmp(node->name, (const xmlChar*) "action")) {
+                    ObAction *a = action_parse
+                        (i, doc, node, OB_USER_ACTION_MENU_SELECTION);
+                    if (a)
+                        acts = g_slist_append(acts, a);
+                }
             menu_add_normal(state->parent, -1, label, acts);
             g_free(label);
         }