X-Git-Url: https://git.sesse.net/?p=pr0n;a=blobdiff_plain;f=perl%2FSesse%2Fpr0n%2FCommon.pm;h=3463fe61067930c087fd83943be7e5c3b71368dd;hp=9708b7a116591feea37e5cb063ef543ad22b4179;hb=b3731a6d90f8d8bc547b4af5c815b039cc40aadf;hpb=4ba860dbf5ce3e4d84c2ba2f7ee2c54ffcd18966

diff --git a/perl/Sesse/pr0n/Common.pm b/perl/Sesse/pr0n/Common.pm
index 9708b7a..3463fe6 100644
--- a/perl/Sesse/pr0n/Common.pm
+++ b/perl/Sesse/pr0n/Common.pm
@@ -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,10 +559,10 @@ sub make_infobox {
 
 	if (defined($info->{'NikonD1-ISOSetting'})) {
 		push @classic_fields, [ $info->{'NikonD1-ISOSetting'}->[1] . " ISO", 0 ];
-	} elsif (defined($info->{'ISOSetting'})) {
-		push @classic_fields, [ $info->{'ISOSetting'} . " ISO" ];
 	} elsif (defined($info->{'ISO'})) {
 		push @classic_fields, [ $info->{'ISO'} . " ISO" ];
+	} elsif (defined($info->{'ISOSetting'})) {
+		push @classic_fields, [ $info->{'ISOSetting'} . " ISO" ];
 	}
 
 	if (defined($info->{'ExposureBiasValue'}) && $info->{'ExposureBiasValue'} ne "0") {