summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2007-10-04 17:05:22 +0000
committerPascal Rigaux <pixel@mandriva.com>2007-10-04 17:05:22 +0000
commit3bb0b86b399557f166c0af046d32e634b3a3d1c7 (patch)
treef52e4cd70ccc7277bdeafbe55b08efd5ad1981b0
parentfc640a6f1faf145c00d214fb57d411ccdd89450f (diff)
downloaddrakx-kbd-mouse-x11-3bb0b86b399557f166c0af046d32e634b3a3d1c7.tar
drakx-kbd-mouse-x11-3bb0b86b399557f166c0af046d32e634b3a3d1c7.tar.gz
drakx-kbd-mouse-x11-3bb0b86b399557f166c0af046d32e634b3a3d1c7.tar.bz2
drakx-kbd-mouse-x11-3bb0b86b399557f166c0af046d32e634b3a3d1c7.tar.xz
drakx-kbd-mouse-x11-3bb0b86b399557f166c0af046d32e634b3a3d1c7.zip
- if we probe a monitor EISA_ID but we don't have corresponding
HorizSync/VertRefresh, we must not the monitor info yet another regression introduced when modifying is_valid() for automatic resolution
-rw-r--r--NEWS2
-rw-r--r--lib/Xconfig/monitor.pm2
2 files changed, 3 insertions, 1 deletions
diff --git a/NEWS b/NEWS
index 927da3a..be2ea7b 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,5 @@
+- if we probe a monitor EISA_ID but we don't have corresponding
+ HorizSync/VertRefresh, we must not the monitor info
- when checking dkms module packages, check that modules are either
available in urpmi media, or already installed (fix detection in live)
diff --git a/lib/Xconfig/monitor.pm b/lib/Xconfig/monitor.pm
index 23802e5..38793da 100644
--- a/lib/Xconfig/monitor.pm
+++ b/lib/Xconfig/monitor.pm
@@ -163,7 +163,7 @@ sub configure_automatic {
if (my $mon = find { lc($_->{EISA_ID}) eq $monitor->{EISA_ID} } monitors_db()) {
add2hash($monitor, $mon);
log::l("EISA_ID corresponds to: $monitor->{ModelName}");
- } elsif (!is_valid($monitor)) {
+ } elsif (!$monitor->{HorizSync} || !$monitor->{VertRefresh}) {
log::l("unknown EISA_ID and partial DDC probe, so unknown monitor");
delete @$monitor{'VendorName', 'ModelName', 'EISA_ID'};
}