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

View File

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