From: Dana Jansens <danakj@orodu.net>
Date: Tue, 24 Apr 2007 14:39:32 +0000 (+0000)
Subject: merge r5755 from trunk
X-Git-Tag: openbox-3_3_991-RELEASE~231
X-Git-Url: http://git.openbox.org/?a=commitdiff_plain;h=8a805e99c8390cd6ea8caf6d8030a4099ff168a3;p=dana%2Fopenbox.git

merge r5755 from trunk
---

diff --git a/parser/parse.c b/parser/parse.c
index 9b8924ca..011808fb 100644
--- a/parser/parse.c
+++ b/parser/parse.c
@@ -87,11 +87,12 @@ gboolean parse_load_rc(const gchar *file, xmlDocPtr *doc, xmlNodePtr *root,
 
     *fileused = NULL;
 
-    for (it = xdg_config_dir_paths; !r && it; it = g_slist_next(it)) {
-        if (file) {
-            if ((r = parse_load(file, "openbox_config", doc, root)))
-                *fileused = g_strdup(file);
-        } else {
+    if (file) {
+        if ((r = parse_load(file, "openbox_config", doc, root)))
+            *fileused = g_strdup(file);
+    } else {
+        /* this won't run if the above code loaded a config */
+        for (it = xdg_config_dir_paths; !r && it; it = g_slist_next(it)) {
             gchar *path;
 
             path = g_build_filename(it->data, "openbox", "rc.xml", NULL);