Make ISO prioritized over ISOSetting (D70 fix).

[pr0n] / perl / Sesse / pr0n / Common.pm

diff --git a/perl/Sesse/pr0n/Common.pm b/perl/Sesse/pr0n/Common.pm
index 01d5a925f9d54ec62c8a444dfd3b7eb3209410ee..3463fe61067930c087fd83943be7e5c3b71368dd 100644 (file)
--- a/perl/Sesse/pr0n/Common.pm
+++ b/perl/Sesse/pr0n/Common.pm
@@ -35,7 +35,7 @@ BEGIN {
                require Sesse::pr0n::Config_local;
        };
 
-       $VERSION     = "v2.51";
+       $VERSION     = "v2.53";
        @ISA         = qw(Exporter);
        @EXPORT      = qw(&error &dberror);
        %EXPORT_TAGS = qw();
@@ -371,7 +371,7 @@ sub ensure_cached {
        my ($r, $filename, $id, $dbwidth, $dbheight, $infobox, $xres, $yres, @otherres) = @_;
 
        my $fname = get_disk_location($r, $id);
-       unless (defined($xres) && ($xres < $dbheight || $yres < $dbwidth || !defined($dbwidth) || !defined($dbheight) || $xres == -1)) {
+       unless (defined($xres) && (!defined($dbwidth) || !defined($dbheight) || $xres < $dbheight || $yres < $dbwidth || $xres == -1)) {
                return ($fname, 0);
        }
 
@@ -559,6 +559,8 @@ sub make_infobox {
 
        if (defined($info->{'NikonD1-ISOSetting'})) {
                push @classic_fields, [ $info->{'NikonD1-ISOSetting'}->[1] . " ISO", 0 ];
+       } elsif (defined($info->{'ISO'})) {
+               push @classic_fields, [ $info->{'ISO'} . " ISO" ];
        } elsif (defined($info->{'ISOSetting'})) {
                push @classic_fields, [ $info->{'ISOSetting'} . " ISO" ];
        }