diff options
author | Drew DeVault <ddevault@linode.com> | 2015-08-10 15:45:36 -0400 |
---|---|---|
committer | Drew DeVault <ddevault@linode.com> | 2015-08-10 15:45:36 -0400 |
commit | 54374d81b560d572fef5b1e5a38704349f31998e (patch) | |
tree | 3f12e656e8c7e069b4947d1e62d0b83ca33f4b65 /sway | |
parent | Merge pull request #9 from Luminarys/master (diff) | |
download | sway-54374d81b560d572fef5b1e5a38704349f31998e.tar.gz sway-54374d81b560d572fef5b1e5a38704349f31998e.tar.zst sway-54374d81b560d572fef5b1e5a38704349f31998e.zip |
Fix some errors with config loading
Diffstat (limited to 'sway')
-rw-r--r-- | sway/commands.c | 3 | ||||
-rw-r--r-- | sway/main.c | 4 |
2 files changed, 5 insertions, 2 deletions
diff --git a/sway/commands.c b/sway/commands.c index 0f5f9286..3f9cc73f 100644 --- a/sway/commands.c +++ b/sway/commands.c | |||
@@ -368,5 +368,8 @@ int handle_command(struct sway_config *config, char *exec) { | |||
368 | free(argv[i]); | 368 | free(argv[i]); |
369 | } | 369 | } |
370 | free(argv); | 370 | free(argv); |
371 | if (ret != 0) { | ||
372 | sway_log(L_ERROR, "Command failed: %s", cmd); | ||
373 | } | ||
371 | return ret; | 374 | return ret; |
372 | } | 375 | } |
diff --git a/sway/main.c b/sway/main.c index 900e6e5d..af8c6ed1 100644 --- a/sway/main.c +++ b/sway/main.c | |||
@@ -43,8 +43,8 @@ int main(int argc, char **argv) { | |||
43 | } | 43 | } |
44 | 44 | ||
45 | setenv("DISPLAY", ":1", 1); | 45 | setenv("DISPLAY", ":1", 1); |
46 | if (load_config()) { | 46 | if (!load_config()) { |
47 | exit(1); | 47 | sway_abort("Unable to load config"); |
48 | } | 48 | } |
49 | 49 | ||
50 | wlc_run(); | 50 | wlc_run(); |