koma/i3
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bugfix: correctly store the config path for using it for I3_CONFIG_PATH later

Browse Source
This commit is contained in:
Michael Stapelberg
2011-03-19 21:50:13 +01:00
parent 9344b9790c
commit 626c65b0d8
3 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/config.c
View File

@ -19,7 +19,7 @@
#include "all.h"
const char *saved_configpath = NULL;
const char *current_configpath = NULL;
Config config;
struct modes_head modes;
@ -233,19 +233,23 @@ static char *get_config_path() {
*
*/
static void parse_configuration(const char *override_configpath) {
static const char *saved_configpath = NULL;
if (override_configpath != NULL) {
saved_configpath = override_configpath;
current_configpath = override_configpath;
parse_file(override_configpath);
return;
}
else if (saved_configpath != NULL) {
current_configpath = saved_configpath;
parse_file(saved_configpath);
return;
}
char *path = get_config_path();
DLOG("Parsing configfile %s\n", path);
current_configpath = path;
parse_file(path);
free(path);
}