aboutsummaryrefslogtreecommitdiffstats
path: root/monitor-edid
diff options
context:
space:
mode:
authorAnssi Hannula <anssi@mandriva.org>2010-01-03 12:11:12 +0000
committerAnssi Hannula <anssi@mandriva.org>2010-01-03 12:11:12 +0000
commitd0c2f736167e9e4f5fde49ce16b89dfa22185d7a (patch)
treeb9664b0e8e64adfad6658ea313fc98d40a8e5a32 /monitor-edid
parent75dc2ecd455b85e78aaa77212cb33eeb7ffb74bc (diff)
downloadmonitor-edid-d0c2f736167e9e4f5fde49ce16b89dfa22185d7a.tar
monitor-edid-d0c2f736167e9e4f5fde49ce16b89dfa22185d7a.tar.gz
monitor-edid-d0c2f736167e9e4f5fde49ce16b89dfa22185d7a.tar.bz2
monitor-edid-d0c2f736167e9e4f5fde49ce16b89dfa22185d7a.tar.xz
monitor-edid-d0c2f736167e9e4f5fde49ce16b89dfa22185d7a.zip
Fix exit status logic introduced in previous commits.
Diffstat (limited to 'monitor-edid')
-rwxr-xr-xmonitor-edid8
1 files changed, 5 insertions, 3 deletions
diff --git a/monitor-edid b/monitor-edid
index 54d41a4..3daca53 100755
--- a/monitor-edid
+++ b/monitor-edid
@@ -92,13 +92,15 @@ sub get_edids {
foreach my $port ($min_port .. $max_port) {
warn "probing EDID using VBE (port $port)\n" if $opt{verbose};
my $edid = `$cmd --port $port $skip_vbe`;
- if ($? >> 8 == 2) {
+ my $status = $? >> 8;
+ if ($status == 1) {
warn "VBE info call failed, skipping all ports\n" if $opt{verbose};
last;
}
- $skip_vbe = "--skip-vbe-check"; # VBE call ok, skip that for other ports
- is_edid_possibly_valid($edid) or next;
+ # skip VBE check for other ports if it was OK
+ $skip_vbe = "--skip-vbe-check" if $status == 0 || $status == 2;
+ is_edid_possibly_valid($edid) or next;
next if grep { $_->[1] eq $edid } @l;
push @l, [ "vbe$port" => $edid ];
last if $b_get_first;