diff options
| author | Patrick Sauter <p@trick.codes> | 2016-10-02 17:29:40 -0500 |
|---|---|---|
| committer | Drew DeVault <sir@cmpwn.com> | 2016-10-04 17:25:09 -0400 |
| commit | 73e3f0e0469bd6a7cad43dd07cfea8f02e6537b6 (patch) | |
| tree | 68a34cf4b5e032182d49931647b49a61707206bf | |
| parent | 2d22a6fa1eb864393a022c478966f5d8a8e0679d (diff) | |
moved ipc_init above config file processing.
This is necessary because commands in the config file (mode for
instance) emit ipc events, and if ipc_init has not been called the
ipc_clients_list is not initialized, and we segfault. This fixes that
bug.
| -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(); } |