Fix some errors with config loading

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) {
 		free(argv[i]);
 	}
 	free(argv);
+	if (ret != 0) {
+		sway_log(L_ERROR, "Command failed: %s", cmd);
+	}
 	return ret;
 }
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) {
 	}
 
 	setenv("DISPLAY", ":1", 1);
-	if (load_config()) {
-		exit(1);
+	if (!load_config()) {
+		sway_abort("Unable to load config");
 	}
 
 	wlc_run();