From e1d7fa386efb725ecd526ea24bebcf56cf4b1296 Mon Sep 17 00:00:00 2001
From: Pascal Rigaux <pixel@mandriva.com>
Date: Wed, 27 Sep 2000 00:39:45 +0000
Subject: no_comment

---
 perl-install/Xconfigurator.pm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'perl-install/Xconfigurator.pm')

diff --git a/perl-install/Xconfigurator.pm b/perl-install/Xconfigurator.pm
index e24b8ebba..d5eedcca1 100644
--- a/perl-install/Xconfigurator.pm
+++ b/perl-install/Xconfigurator.pm
@@ -120,7 +120,7 @@ sub readMonitorsDB {
 	$monitors{"$l{vendor}|$l{type}"} = \%l;
     }
     while (my ($k, $v) = each %standard_monitors) {
-	$monitors{"Generic|" . translate($k)} =
+	$monitors{'Generic|' . translate($k)} =
 	    { hsyncrange => $v->[1], vsyncrange => $v->[2] };
     }
 }
@@ -349,7 +349,7 @@ sub monitorConfiguration(;$$) {
 
     readMonitorsDB("/usr/X11R6/lib/X11/MonitorsDB");
 
-    add2hash($monitor, { type => $in->ask_from_treelist(_("Monitor"), _("Choose a monitor"), '|', ['Unlisted', keys %monitors], _("Generic") . '|' . translate($default_monitor)) }) unless $monitor->{type};
+    add2hash($monitor, { type => $in->ask_from_treelist(_("Monitor"), _("Choose a monitor"), '|', ['Unlisted', keys %monitors], 'Generic|' . translate($default_monitor)) }) unless $monitor->{type};
     if ($monitor->{type} eq 'Unlisted') {
 	$in->ask_from_entries_ref('',
 _("The two critical parameters are the vertical refresh rate, which is the rate
@@ -654,7 +654,7 @@ sub resolutionsConfiguration {
     my $wres = first(split 'x', $res);
 
     #- take the first available resolution <= the wanted resolution
-    $wres ||= max map { first(grep { $_->[0] <= $wres } @$_)->[0] } values %{$card->{depth}};
+    $wres = max map { first(grep { $_->[0] <= $wres } @$_)->[0] } values %{$card->{depth}};
     my $depth = eval { $o->{default_depth} || autoDefaultDepth($card, $wres) };
 
     $auto or ($depth, $wres) = chooseResolutions($card, $depth, $wres) or return;
-- 
cgit v1.2.1