diff options
| author | Zandr Martin <zandrmartin@users.noreply.github.com> | 2016-10-02 22:13:40 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-10-02 22:13:40 -0500 |
| commit | 09a44263c38dffccf896beb64199a89012a7ef82 (patch) | |
| tree | 8c5a209bb34529b5926da59612b05010e835b9e0 /sway | |
| parent | 4c0e809028de5efbbfbbbc9685c47b2c0015d56e (diff) | |
| parent | 04db58863e38c800c73736df1910b5164cb66db7 (diff) | |
Merge branch 'master' into fix-focus-segfault
Diffstat (limited to 'sway')
| -rw-r--r-- | sway/main.c | 4 |
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(); } |