Merge branch 'master' into fix-focus-segfault

8 years ago · 09a44263c3
parent 4c0e809028 04db58863e
commit 09a44263c3
1 changed files with 2 additions and 2 deletions
--- a/sway/main.c
+++ b/sway/main.c
@ -213,6 +213,8 @@ int main(int argc, char **argv) {
 	init_layout();
 	ipc_init();
 	if (validate) {
 		bool valid = load_main_config(config_path, false);
 		return valid ? 0 : 1;
@ -226,8 +228,6 @@ int main(int argc, char **argv) {
 		free(config_path);
 	}
 	ipc_init();
 	if (!terminate_request) {
 		wlc_run();
 	}