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 | fix pointer format string in sway_log() call (diff) | |
download | sway-73e3f0e0469bd6a7cad43dd07cfea8f02e6537b6.tar.gz sway-73e3f0e0469bd6a7cad43dd07cfea8f02e6537b6.tar.zst sway-73e3f0e0469bd6a7cad43dd07cfea8f02e6537b6.zip |
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) { | |||
213 | 213 | ||
214 | init_layout(); | 214 | init_layout(); |
215 | 215 | ||
216 | ipc_init(); | ||
217 | |||
216 | if (validate) { | 218 | if (validate) { |
217 | bool valid = load_main_config(config_path, false); | 219 | bool valid = load_main_config(config_path, false); |
218 | return valid ? 0 : 1; | 220 | return valid ? 0 : 1; |
@@ -226,8 +228,6 @@ int main(int argc, char **argv) { | |||
226 | free(config_path); | 228 | free(config_path); |
227 | } | 229 | } |
228 | 230 | ||
229 | ipc_init(); | ||
230 | |||
231 | if (!terminate_request) { | 231 | if (!terminate_request) { |
232 | wlc_run(); | 232 | wlc_run(); |
233 | } | 233 | } |