mirror of
https://github.com/swaywm/sway.git
synced 2024-11-10 20:44:01 +01: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();
|
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();
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user