diff options
| author | Furkan Sahin <furkan-dev@proton.me> | 2016-10-02 18:53:38 -0400 |
|---|---|---|
| committer | Furkan Sahin <furkan-dev@proton.me> | 2016-10-02 18:53:38 -0400 |
| commit | cac6ef7c8ad7c2e7e18bc042de937dca6f7dc618 (patch) | |
| tree | 68a34cf4b5e032182d49931647b49a61707206bf | |
| parent | 4cdc7aec555bc7477742118ef0a4e4b338767ab8 (diff) | |
| parent | 0a27f7f807eb65b9aef23cc1b9ac11a2686a4887 (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(); } |
