Combine the Exit and SessionLogout actions

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

diff --git a/openbox/actions/cyclewindows.c b/openbox/actions/cyclewindows.c
index 059db93f9ccf3900b960e3e28ab1a9a7d1985413..6fba17ffb1f3113ffd0b8d26a936cb91ff2f57d0 100644 (file)
--- a/openbox/actions/cyclewindows.c
+++ b/openbox/actions/cyclewindows.c
@@ -73,7 +73,7 @@ static gpointer setup_func(ObParseInst *i, xmlDocPtr doc, xmlNodePtr node)
         m = parse_find_node("action", n->xmlChildrenNode);
         while (m) {
             ObActionsAct *action = actions_parse(i, doc, m);
-            if (action) o->actions = g_slist_prepend(o->actions, action);
+            if (action) o->actions = g_slist_append(o->actions, action);
             m = parse_find_node("action", m->next);
         }
     }
@@ -134,7 +134,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 TRUE;
 }