commit 09a44263c38dffccf896beb64199a89012a7ef82
parent 4c0e809028de5efbbfbbbc9685c47b2c0015d56e
Author: Zandr Martin <zandrmartin@users.noreply.github.com>
Date: Sun, 2 Oct 2016 22:13:40 -0500
Merge branch 'master' into fix-focus-segfault
Diffstat:
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git 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();
}