nixo
/
gri3-wm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Reload the same config file specified in the command line. 

Fixes: #346
This commit is contained in:
Fernando Tarlá Cardoso Lemos 2011-03-13 20:32:54 -03:00 committed by Michael Stapelberg
parent cdeb49127f
commit b8a716c370
1 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/config.c
View File

@ -1,5 +1,5 @@
/*
* vim:ts=8:expandtab
* vim:ts=4:sw=4:expandtab
*
* i3 - an improved dynamic tiling window manager
*
@ -232,15 +232,22 @@ static char *get_config_path() {
*
*/
static void parse_configuration(const char *override_configpath) {
if (override_configpath != NULL) {
parse_file(override_configpath);
return;
}
static const char *saved_configpath = NULL;
char *path = get_config_path();
DLOG("Parsing configfile %s\n", path);
parse_file(path);
free(path);
if (override_configpath != NULL) {
saved_configpath = override_configpath;
parse_file(override_configpath);
return;
}
else if (saved_configpath != NULL) {
parse_file(saved_configpath);
return;
}
char *path = get_config_path();
DLOG("Parsing configfile %s\n", path);
parse_file(path);
free(path);
}
/*