aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLibravatar Mikkel Oscar Lyderik <mikkeloscar@gmail.com>2016-01-05 19:16:46 +0100
committerLibravatar Mikkel Oscar Lyderik <mikkeloscar@gmail.com>2016-01-05 19:16:46 +0100
commit2e0ef533f29212b80efd69eb647893145e8356ae (patch)
treeab201e04d05993d8e0e692f9f9e4bdce32af070a
parentRevert "Free wordexp_t in config.c:get_config_path" (diff)
downloadsway-2e0ef533f29212b80efd69eb647893145e8356ae.tar.gz
sway-2e0ef533f29212b80efd69eb647893145e8356ae.tar.zst
sway-2e0ef533f29212b80efd69eb647893145e8356ae.zip
Init layout before checking config
-rw-r--r--sway/main.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/sway/main.c b/sway/main.c
index 37681f2d..e85f7269 100644
--- a/sway/main.c
+++ b/sway/main.c
@@ -188,13 +188,13 @@ int main(int argc, char **argv) {
188 sway_log(L_INFO, "Starting sway version %s (%s, branch \"%s\")\n", SWAY_GIT_VERSION, SWAY_VERSION_DATE, SWAY_GIT_BRANCH); 188 sway_log(L_INFO, "Starting sway version %s (%s, branch \"%s\")\n", SWAY_GIT_VERSION, SWAY_VERSION_DATE, SWAY_GIT_BRANCH);
189#endif 189#endif
190 190
191 init_layout();
192
191 if (validate) { 193 if (validate) {
192 bool valid = load_config(config_path); 194 bool valid = load_config(config_path);
193 return valid ? 0 : 1; 195 return valid ? 0 : 1;
194 } 196 }
195 197
196 init_layout();
197
198 if (!load_config(config_path)) { 198 if (!load_config(config_path)) {
199 sway_log(L_ERROR, "Error(s) loading config!"); 199 sway_log(L_ERROR, "Error(s) loading config!");
200 } 200 }