From 2c9f5eca89ac5ab1a3eaacc3b56243978098408c Mon Sep 17 00:00:00 2001 From: Luminarys Date: Thu, 13 Aug 2015 11:32:38 -0500 Subject: Fixes to workspace generation --- sway/main.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'sway/main.c') diff --git a/sway/main.c b/sway/main.c index 7477b08c..b48d4b19 100644 --- a/sway/main.c +++ b/sway/main.c @@ -18,6 +18,9 @@ int main(int argc, char **argv) { /* Signal handling */ signal(SIGCHLD, sigchld_handle); + if (!load_config()) { + sway_abort("Unable to load config"); + } setenv("WLC_DIM", "0", 0); if (!wlc_init(&interface, argc, argv)) { @@ -25,10 +28,6 @@ int main(int argc, char **argv) { } setenv("DISPLAY", ":1", 1); - if (!load_config()) { - sway_abort("Unable to load config"); - } - wlc_run(); return 0; } -- cgit v1.2.3 From ea9efc884d92d32863287b8d8e5a5f8bd631f9f5 Mon Sep 17 00:00:00 2001 From: Luminarys Date: Thu, 13 Aug 2015 14:41:29 -0500 Subject: Allowed for execd commands to be spawned after abort --- sway/main.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'sway/main.c') diff --git a/sway/main.c b/sway/main.c index b48d4b19..061564e2 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_abort("Unable to load config"); + sway_log(L_ERROR, "Config load failed, aborting sway post init!"); } setenv("WLC_DIM", "0", 0); @@ -29,6 +29,7 @@ int main(int argc, char **argv) { setenv("DISPLAY", ":1", 1); wlc_run(); + return 0; } -- cgit v1.2.3