diff options
Diffstat (limited to 'src/generators.c')
| -rw-r--r-- | src/generators.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/generators.c b/src/generators.c index 8db260f..92b8cb2 100644 --- a/src/generators.c +++ b/src/generators.c @@ -150,7 +150,7 @@ generate_image (TGallerySetup *setup, g_free (s1); s1 = item_get_img_src (setup, items, item); big_dst = g_strconcat (dst_dir, "/", setup->img_big_dir, "/", s1, NULL); - if (item->force_fullsize || (items->fullsize && ! item->force_nofullsize) || + if (item->force_fullsize || setup->override_nofullsize || (items->fullsize && ! item->force_nofullsize) || (! item->force_nofullsize && ! items->nofullsize && ! setup->nofullsize)) orig_dst = g_strconcat (dst_dir, "/", setup->img_orig_dir, "/", s1, NULL); res = (! update_when_necessary) || needs_update (thumb_src_full, thumb_dst) || @@ -618,7 +618,8 @@ write_html_image (TGallerySetup *setup, /* Retrieve image sizes of preview and original image */ get_image_sizes (big_dst, &img_big_w, &img_big_h); - image_fullsize = item->force_fullsize || (parent_items->fullsize && ! item->force_nofullsize) || + image_fullsize = item->force_fullsize || setup->override_nofullsize || + (parent_items->fullsize && ! item->force_nofullsize) || (! item->force_nofullsize && ! parent_items->nofullsize && ! setup->nofullsize); if (image_fullsize) get_image_sizes (orig_dst, &img_orig_w, &img_orig_h); |