diff options
| author | Drew DeVault <sir@cmpwn.com> | 2016-10-02 18:53:38 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-10-02 18:53:38 -0400 |
| commit | 04db58863e38c800c73736df1910b5164cb66db7 (patch) | |
| tree | 68a34cf4b5e032182d49931647b49a61707206bf | |
| parent | 79d2b0dee4362b6b2b25734ed7e24c698e7067b8 (diff) | |
| parent | 153620aefebbff9db501fd64c2b6e073c7f5bc3f (diff) | |
Merge pull request #923 from gutsoo/master
moved ipc_init above config file processing.
| -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(); } |