summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/imlib.c11
1 files changed, 11 insertions, 0 deletions
diff --git a/src/imlib.c b/src/imlib.c
index 1e4eb3f..d83cc08 100644
--- a/src/imlib.c
+++ b/src/imlib.c
@@ -315,6 +315,17 @@ static char *feh_magick_load_image(char *filename)
weprintf("%s - No loader for that file format",
filename);
}
+
+ /*
+ * Reap child. The previous waitpid call was interrupted by
+ * alarm, but convert doesn't terminate immediately.
+ * XXX
+ * normally, if (WIFSIGNALED(status)) waitpid(childpid, &status, 0);
+ * would suffice. However, as soon as feh has its own window,
+ * this doesn't work anymore and the following workaround is
+ * required. Hm.
+ */
+ waitpid(-1, &status, 0);
}
}