|
|
@ -188,13 +188,13 @@ int main(int argc, char **argv) {
|
|
|
|
sway_log(L_INFO, "Starting sway version %s (%s, branch \"%s\")\n", SWAY_GIT_VERSION, SWAY_VERSION_DATE, SWAY_GIT_BRANCH);
|
|
|
|
sway_log(L_INFO, "Starting sway version %s (%s, branch \"%s\")\n", SWAY_GIT_VERSION, SWAY_VERSION_DATE, SWAY_GIT_BRANCH);
|
|
|
|
#endif
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
init_layout();
|
|
|
|
|
|
|
|
|
|
|
|
if (validate) {
|
|
|
|
if (validate) {
|
|
|
|
bool valid = load_config(config_path);
|
|
|
|
bool valid = load_config(config_path);
|
|
|
|
return valid ? 0 : 1;
|
|
|
|
return valid ? 0 : 1;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
init_layout();
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if (!load_config(config_path)) {
|
|
|
|
if (!load_config(config_path)) {
|
|
|
|
sway_log(L_ERROR, "Error(s) loading config!");
|
|
|
|
sway_log(L_ERROR, "Error(s) loading config!");
|
|
|
|
}
|
|
|
|
}
|
|
|
|