Permalink
Browse files

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

  • Loading branch information...
reald committed Mar 7, 2012
2 parents 93a90e6 + 3b2756b commit 77fa5aca182435f2771511832ea198d027393ceb
Showing with 157 additions and 212 deletions.
  1. +3 −1 src/imlib.c
  2. +149 −205 src/menu.c
  3. +5 −6 src/menu.h
View
@@ -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)
Oops, something went wrong.

0 comments on commit 77fa5ac

Please sign in to comment.