Merge branch 'master' into fix-focus-segfault

1 files changed, 2 insertions, 2 deletions

diff --git a/sway/main.c b/sway/main.c
index 660da18c..b924a9ab 100644
--- 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();
         }