monitor-parse-edid:

  o output an error message when --monitorsdb fails (see Mandriva bugs
    #28857 and #40609)

2 files changed, 10 insertions, 1 deletions

diff --git a/NEWS b/NEWS
index a0bdb11..c85235b 100644
--- a/NEWS
+++ b/NEWS
@@ -34,6 +34,8 @@
     comment for the other modelines
   o allow null manufacturer name, instead check that EDID version is 1.x
     or 2.x (see Mandriva bug #28857)
+  o output an error message when --monitorsdb fails (see Mandriva bugs
+    #28857 and #40609)
 
 - monitor-edid, monitor-get-edid:
   o do not get duplicate EDIDs if the same EDID is available via
diff --git a/monitor-parse-edid b/monitor-parse-edid
index 5a6f4f0..389658a 100755
--- a/monitor-parse-edid
+++ b/monitor-parse-edid
@@ -588,7 +588,14 @@ sub ratio_name {
 sub to_MonitorsDB {
     my ($edid) = @_;
 
-    $edid->{monitor_range} && $edid->{EISA_ID} or return;
+    if (!$edid->{monitor_range}) {
+	print STDERR "No monitor range data in EDID.\n";
+	return;
+    }
+    if (!$edid->{EISA_ID}) {
+	print STDERR "No monitor EISA_ID in EDID.\n";
+	return;
+    }
 
     my $detailed_timings = $edid->{detailed_timings} || [];
     my @preferred_resolutions = map {