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 | |
parent | prevent dereference of freed workspace (diff) | |
parent | Merge pull request #923 from gutsoo/master (diff) | |
download | sway-09a44263c38dffccf896beb64199a89012a7ef82.tar.gz sway-09a44263c38dffccf896beb64199a89012a7ef82.tar.zst sway-09a44263c38dffccf896beb64199a89012a7ef82.zip |
Merge branch 'master' into fix-focus-segfault
-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 | } |