mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2025-11-03 09:01:43 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into fix-focus-segfault

Browse source
This commit is contained in:
Zandr Martin 2016-10-02 22:13:40 -05:00 • committed by GitHub
commit 09a44263c3
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
sway/main.c
View file

@ -213,6 +213,8 @@ int main(int argc, char **argv) {
init_layout(); init_layout();
ipc_init();
if (validate) { if (validate) {
bool valid = load_main_config(config_path, false); bool valid = load_main_config(config_path, false);
return valid ? 0 : 1; return valid ? 0 : 1;
@ -226,8 +228,6 @@ int main(int argc, char **argv) {
free(config_path); free(config_path);
} }
ipc_init();
if (!terminate_request) { if (!terminate_request) {
wlc_run(); wlc_run();
} }