From cc7a18807663313ef111d86a75844ded0416a889 Mon Sep 17 00:00:00 2001 From: Dana Jansens Date: Fri, 5 Aug 2011 12:05:10 -0400 Subject: [PATCH] Load the rc.xml config file given on --config-file the same as Openbox (use the whole path given). --- src/main.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/src/main.c b/src/main.c index 9035e8d..a576253 100644 --- a/src/main.c +++ b/src/main.c @@ -233,11 +233,10 @@ int main(int argc, char **argv) } xmlIndentTreeOutput = 1; - if (!obt_xml_load_config_file(parse_i, - "openbox", - (obc_config_file ? - obc_config_file : "rc.xml"), - "openbox_config")) + if (!((obc_config_file && + obt_xml_load_file(parse_i, obc_config_file, "openbox_config")) || + obt_xml_load_config_file(parse_i, "openbox", "rc.xml", + "openbox_config"))) { obconf_error(_("Failed to load an rc.xml. You have probably failed to install Openbox properly."), TRUE); exit_with_error = TRUE; -- 2.39.2