Commit 58dd2e30 authored by Dennis Real's avatar Dennis Real
Browse files

Merge branch 'master' of git://github.com/derf/feh

parents cf6f0320 82a976e0
Loading
Loading
Loading
Loading
+1 −0
Original line number Diff line number Diff line
@@ -305,6 +305,7 @@ static char *feh_magick_load_image(char *filename)
		if (!WIFEXITED(status) || (WEXITSTATUS(status) != 0)) {
			close(fd);
			unlink(sfn);
			free(sfn);
			sfn = NULL;

			if (!opt.quiet) {
+1 −0
Original line number Diff line number Diff line
@@ -42,6 +42,7 @@ static winwidget winwidget_allocate(void)
	winwidget ret = NULL;

	ret = emalloc(sizeof(_winwidget));
	memset(ret, 0, sizeof(_winwidget));

	ret->win = 0;
	ret->w = 0;