Merge branch 'backport' into work

[chaz/openbox] / openbox / actions / directionalwindows.c

diff --git a/openbox/actions/directionalwindows.c b/openbox/actions/directionalwindows.c
index 05b841d362434b4a432baf32309c8445f0ab62f8..c5c25c11329b0aa7768df61a60f0c55597069fab 100644 (file)
--- a/openbox/actions/directionalwindows.c
+++ b/openbox/actions/directionalwindows.c
@@ -88,7 +88,7 @@ static gpointer setup_func(xmlNodePtr node)
     if ((n = obt_parse_find_node(node, "finalactions"))) {
         xmlNodePtr m;
 
-        m = obt_parse_find_node(n->xmlChildrenNode, "action");
+        m = obt_parse_find_node(n->children, "action");
         while (m) {
             ObActionsAct *action = actions_parse(m);
             if (action) o->actions = g_slist_prepend(o->actions, action);
@@ -152,7 +152,7 @@ static gboolean run_func(ObActionsData *data, gpointer options)
         cycling = TRUE;
 
         stacking_restore();
-        if (o->raise) stacking_temp_raise(CLIENT_AS_WINDOW(ft));
+        if (o->raise && ft) stacking_temp_raise(CLIENT_AS_WINDOW(ft));
     }
 
     return o->interactive;