diff options
| author |  Luminarys <kizunanohikari@gmail.com> | 2015-08-10 14:24:31 -0500 |
|---|---|---|
| committer | Luminarys <kizunanohikari@gmail.com> | 2015-08-10 14:24:31 -0500 |
| commit | 88997bbfe65c20ff2bbc28f49ee2d84a79972d61 (patch) | |
| tree | 03362796768e30703d463febd494d7956b271cc3 /sway | |
| parent | Abstracted load_config (diff) | |
| download | sway-88997bbfe65c20ff2bbc28f49ee2d84a79972d61.tar.gz sway-88997bbfe65c20ff2bbc28f49ee2d84a79972d61.tar.zst sway-88997bbfe65c20ff2bbc28f49ee2d84a79972d61.zip | |
Minor fix
Diffstat (limited to 'sway')
| -rw-r--r-- | sway/commands.c | 20 |
1 files changed, 2 insertions, 18 deletions
diff --git a/sway/commands.c b/sway/commands.c index 98786885..4db254b6 100644 --- a/sway/commands.c +++ b/sway/commands.c | |||
| @@ -179,24 +179,8 @@ int cmd_reload(struct sway_config *config, int argc, char **argv) { | |||
| 179 | sway_log(L_ERROR, "Invalid reload command (expected 0 arguments, got %d)", argc); | 179 | sway_log(L_ERROR, "Invalid reload command (expected 0 arguments, got %d)", argc); |
| 180 | return 1; | 180 | return 1; |
| 181 | } | 181 | } |
| 182 | 182 | if (!load_config()) { | |
| 183 | // TODO: Allow use of more config file locations | 183 | return 1; |
| 184 | const char *name = "/.sway/config"; | ||
| 185 | const char *home = getenv("HOME"); | ||
| 186 | char *temp = malloc(strlen(home) + strlen(name) + 1); | ||
| 187 | strcpy(temp, home); | ||
| 188 | strcat(temp, name); | ||
| 189 | FILE *f = fopen(temp, "r"); | ||
| 190 | if (!f) { | ||
| 191 | sway_log(L_ERROR, "Sway config file not found, aborting reload!"); | ||
| 192 | free(temp); | ||
| 193 | return 1; | ||
| 194 | } | ||
| 195 | free(temp); | ||
| 196 | config = read_config(f, true); | ||
| 197 | fclose(f); | ||
| 198 | if (load_config()) { | ||
| 199 | |||
| 200 | } | 184 | } |
| 201 | 185 | ||
| 202 | return 0; | 186 | return 0; |