From 6e8280e7fdc139ad14ea99ddd885ee02cba05b7b Mon Sep 17 00:00:00 2001 From: Drew DeVault Date: Sun, 16 Aug 2015 12:03:34 -0400 Subject: [PATCH] Config errors should not be fatal --- sway/handlers.c | 6 ------ sway/main.c | 2 +- 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/sway/handlers.c b/sway/handlers.c index 9944be33c..15dd1b773 100644 --- a/sway/handlers.c +++ b/sway/handlers.c @@ -223,12 +223,6 @@ static void handle_wlc_ready(void) { handle_command(config, config->cmd_queue->items[i]); } free_flat_list(config->cmd_queue); - - if (config->failed) { - sway_log(L_ERROR, "Programs have been execd, aborting!"); - sway_abort("Unable to load config"); - } - config->active = true; } diff --git a/sway/main.c b/sway/main.c index fedffdf77..ebf7f56e0 100644 --- a/sway/main.c +++ b/sway/main.c @@ -19,7 +19,7 @@ int main(int argc, char **argv) { signal(SIGCHLD, sigchld_handle); if (!load_config()) { - sway_log(L_ERROR, "Config load failed, aborting sway post init!"); + sway_log(L_ERROR, "Errors loading config!"); } setenv("WLC_IDLE_TIME", "0", 0);