Commit 77fa5aca authored by Dennis Real's avatar Dennis Real
Browse files

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

parents 93a90e60 3b2756bf

src/imlib.c

+3 −1
Original line number Diff line number Diff line
@@ -1108,7 +1108,7 @@ void feh_edit_inplace_lossless(winwidget w, int op) 
				"-outfile", file_str, file_str, NULL);



		im_weprintf(w, "lossless %s: Is 'jpegtran' installed? Failed to exec:", op_name);

		return;

		exit(1);

	} else {

		waitpid(pid, &status, 0);
@@ -1118,9 +1118,11 @@ void feh_edit_inplace_lossless(winwidget w, int op) 
					" Commandline was: "

					"jpegtran -copy all %s %s -outfile %s %s",

					op_name, status >> 8, op_op, op_value, file_str, file_str);

			free(file_str);

			return;

		}

	}

	free(file_str);

}



void feh_draw_actions(winwidget w)

src/menu.c

+149 −205

File changed.

Preview size limit exceeded, changes collapsed.

src/menu.h

+5 −6

File changed.

Preview size limit exceeded, changes collapsed.