Skip to content

Commit

Permalink
Merge pull request #923 from gutsoo/master
Browse files Browse the repository at this point in the history
moved ipc_init above config file processing.
  • Loading branch information
ddevault authored Oct 2, 2016
2 parents 79d2b0d + 153620a commit 04db588
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions sway/main.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -226,8 +228,6 @@ int main(int argc, char **argv) {
free(config_path);
}

ipc_init();

if (!terminate_request) {
wlc_run();
}
Expand Down

0 comments on commit 04db588

Please sign in to comment.