summaryrefslogtreecommitdiffstats
path: root/perl-install
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2002-08-26 21:24:57 +0000
committerPascal Rigaux <pixel@mandriva.com>2002-08-26 21:24:57 +0000
commit2bf3cbaa2ecb5917ca9853f09bbabd334852d499 (patch)
tree081463e69749857a10acd5e3c349d814aaf16ae1 /perl-install
parent585e6c72049cc869a322d7ae42cfaf620aca37a2 (diff)
downloaddrakx-2bf3cbaa2ecb5917ca9853f09bbabd334852d499.tar
drakx-2bf3cbaa2ecb5917ca9853f09bbabd334852d499.tar.gz
drakx-2bf3cbaa2ecb5917ca9853f09bbabd334852d499.tar.bz2
drakx-2bf3cbaa2ecb5917ca9853f09bbabd334852d499.tar.xz
drakx-2bf3cbaa2ecb5917ca9853f09bbabd334852d499.zip
fix 2 occurences of use of $monitors as a hash (thanks to Nora Etukudo)
Diffstat (limited to 'perl-install')
-rw-r--r--perl-install/Xconfig/monitor.pm5
1 files changed, 2 insertions, 3 deletions
diff --git a/perl-install/Xconfig/monitor.pm b/perl-install/Xconfig/monitor.pm
index 3aab9fe6e..c69f8b281 100644
--- a/perl-install/Xconfig/monitor.pm
+++ b/perl-install/Xconfig/monitor.pm
@@ -11,7 +11,6 @@ use log;
my $good_default_monitor = arch() !~ /ppc/ ? 'Generic|1024x768 @ 70 Hz' :
detect_devices::get_mac_model =~ /^iBook/ ? 'Apple|iBook 800x600' : 'Apple|iMac/PowerBook 1024x768';
-my $low_default_monitor = 'Generic|800x600 @ 56 Hz';
my @VertRefresh_ranges = ("50-70", "50-90", "50-100", "40-150");
@@ -59,7 +58,7 @@ sub configure_auto_install {
put_in_hash($monitor, $old_monitor);
my $monitors = monitors();
- configure_automatic($monitor, $monitors) or put_in_hash($monitor, $monitors->{$low_default_monitor});
+ configure_automatic($monitor, $monitors) or put_in_hash($monitor, { HorizSync => '31.5-35.1', VertRefresh => '50-61' });
$raw_X->set_monitors($monitor);
$monitor;
}
@@ -80,7 +79,7 @@ sub choose {
} else {
my $merged_name = $monitor->{VendorName} . '|' . $monitor->{ModelName};
- if (!exists $monitors->{$merged_name}) {
+ if (!exists $h_monitors{$merged_name}) {
$merged_name = $monitor->{HorizSync} ? 'Custom' : $good_default_monitor;
} else {
$merged_name;