mirrors
/
sway
mirror of https://github.com/swaywm/sway.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into fix-focus-segfault

This commit is contained in:
Zandr Martin 2016-10-02 22:13:40 -05:00 committed by GitHub
parent 4c0e809028 04db58863e
commit 09a44263c3
1 changed files with 2 additions and 2 deletions
Show Stats 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();
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();
}