mirror of
https://github.com/swaywm/sway.git
synced 2024-11-30 03:41:27 +00:00
Merge branch 'master' into fix-focus-segfault
This commit is contained in:
commit
09a44263c3
|
@ -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();
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue