summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLibravatar Drew DeVault <sir@cmpwn.com>2015-08-16 12:03:34 -0400
committerLibravatar Drew DeVault <sir@cmpwn.com>2015-08-16 12:03:34 -0400
commit6e8280e7fdc139ad14ea99ddd885ee02cba05b7b (patch)
tree107a9873536911dd200524ea11c3d2abe74efdfd
parentMove headers to include/ (diff)
downloadsway-6e8280e7fdc139ad14ea99ddd885ee02cba05b7b.tar.gz
sway-6e8280e7fdc139ad14ea99ddd885ee02cba05b7b.tar.zst
sway-6e8280e7fdc139ad14ea99ddd885ee02cba05b7b.zip
Config errors should not be fatal
-rw-r--r--sway/handlers.c6
-rw-r--r--sway/main.c2
2 files changed, 1 insertions, 7 deletions
diff --git a/sway/handlers.c b/sway/handlers.c
index 9944be33..15dd1b77 100644
--- a/sway/handlers.c
+++ b/sway/handlers.c
@@ -223,12 +223,6 @@ static void handle_wlc_ready(void) {
223 handle_command(config, config->cmd_queue->items[i]); 223 handle_command(config, config->cmd_queue->items[i]);
224 } 224 }
225 free_flat_list(config->cmd_queue); 225 free_flat_list(config->cmd_queue);
226
227 if (config->failed) {
228 sway_log(L_ERROR, "Programs have been execd, aborting!");
229 sway_abort("Unable to load config");
230 }
231
232 config->active = true; 226 config->active = true;
233} 227}
234 228
diff --git a/sway/main.c b/sway/main.c
index fedffdf7..ebf7f56e 100644
--- a/sway/main.c
+++ b/sway/main.c
@@ -19,7 +19,7 @@ int main(int argc, char **argv) {
19 signal(SIGCHLD, sigchld_handle); 19 signal(SIGCHLD, sigchld_handle);
20 20
21 if (!load_config()) { 21 if (!load_config()) {
22 sway_log(L_ERROR, "Config load failed, aborting sway post init!"); 22 sway_log(L_ERROR, "Errors loading config!");
23 } 23 }
24 24
25 setenv("WLC_IDLE_TIME", "0", 0); 25 setenv("WLC_IDLE_TIME", "0", 0);