parent
cdeb49127f
commit
b8a716c370
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
* vim:ts=8:expandtab
|
||||
* vim:ts=4:sw=4:expandtab
|
||||
*
|
||||
* 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 const char *saved_configpath = NULL;
|
||||
|
||||
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);
|
||||
|
|
Loading…
Reference in New Issue