aboutsummaryrefslogtreecommitdiff
path: root/main.c
diff options
context:
space:
mode:
authorDaniel Eklöf <daniel@ekloef.se>2020-07-14 06:35:47 +0000
committerDaniel Eklöf <daniel@ekloef.se>2020-07-14 06:35:47 +0000
commitfa75e1646a3cbd1568f50b9a552d8d2d2814f659 (patch)
tree62def00b813eb3196e91e642126acd8dd99b37b7 /main.c
parentrender: keep lock while pushing dirty rows to worker queue (diff)
parentchangelog: mention fix for 'too many wl_surface_damage_buffer()' calls (diff)
Merge branch 'merge-wl-surface-damage'
Closes #35
Diffstat (limited to 'main.c')
-rw-r--r--main.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/main.c b/main.c
index 02bd7fcd..590e01c0 100644
--- a/main.c
+++ b/main.c
@@ -403,10 +403,10 @@ main(int argc, char *const *argv)
if (!as_server && (term = term_init(
&conf, fdm, reaper, wayl, "foot", cwd, argc, argv,
&term_shutdown_cb, &shutdown_ctx)) == NULL) {
- free(cwd);
goto out;
}
free(cwd);
+ cwd = NULL;
if (as_server && (server = server_init(&conf, fdm, reaper, wayl)) == NULL)
goto out;
@@ -439,6 +439,7 @@ main(int argc, char *const *argv)
ret = aborted || tll_length(wayl->terms) == 0 ? EXIT_SUCCESS : EXIT_FAILURE;
out:
+ free(cwd);
server_destroy(server);
term_destroy(term);