aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorcorvid <corvid@lavabit.com>2009-09-11 01:56:58 +0000
committercorvid <corvid@lavabit.com>2009-09-11 01:56:58 +0000
commitd2f3d5f4be9be7d7a0c51b2bf83d0b149bc729f1 (patch)
tree26841a03b83a9bde4bed871601f9757d58436d23
parent68fc0de443c9561e9859270d5b1169e084f969e6 (diff)
only show JPEG errors if prefs.show_msg set
-rw-r--r--src/jpeg.c9
1 files changed, 6 insertions, 3 deletions
diff --git a/src/jpeg.c b/src/jpeg.c
index b61d8dd4..9c2b327a 100644
--- a/src/jpeg.c
+++ b/src/jpeg.c
@@ -87,11 +87,14 @@ METHODDEF(void) Jpeg_errorexit (j_common_ptr cinfo);
/* this is the routine called by libjpeg when it detects an error. */
METHODDEF(void) Jpeg_errorexit (j_common_ptr cinfo)
{
- DilloJpeg *jpeg = ((my_source_mgr *) ((j_decompress_ptr) cinfo)->src)->jpeg;
- MSG_WARN("\"%s\": ", URL_STR(jpeg->url));
/* display message and return to setjmp buffer */
my_error_ptr myerr = (my_error_ptr) cinfo->err;
- (*cinfo->err->output_message) (cinfo);
+ if (prefs.show_msg) {
+ DilloJpeg *jpeg =
+ ((my_source_mgr *) ((j_decompress_ptr) cinfo)->src)->jpeg;
+ MSG_WARN("\"%s\": ", URL_STR(jpeg->url));
+ (*cinfo->err->output_message) (cinfo);
+ }
longjmp(myerr->setjmp_buffer, 1);
}