summaryrefslogtreecommitdiffstats
path: root/perl-install
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2004-02-06 20:04:30 +0000
committerPascal Rigaux <pixel@mandriva.com>2004-02-06 20:04:30 +0000
commit816761acf9e589632e9c9e87fd6667b7927bf953 (patch)
tree3c0f2cfd8b97bb0b3fc08ad5a57d2d97ae6027b2 /perl-install
parent428226c89c0b9631f120af80e0138f4c1ac9a794 (diff)
downloaddrakx-816761acf9e589632e9c9e87fd6667b7927bf953.tar
drakx-816761acf9e589632e9c9e87fd6667b7927bf953.tar.gz
drakx-816761acf9e589632e9c9e87fd6667b7927bf953.tar.bz2
drakx-816761acf9e589632e9c9e87fd6667b7927bf953.tar.xz
drakx-816761acf9e589632e9c9e87fd6667b7927bf953.zip
- ensure ModelName comes from the ddc probe when choosing "Plug'n Play"
- only "Plug'n Play" instead of "Plug'n Play (<ModelName>)" when current monitor is not plug'n play
Diffstat (limited to 'perl-install')
-rw-r--r--perl-install/Xconfig/monitor.pm4
1 files changed, 2 insertions, 2 deletions
diff --git a/perl-install/Xconfig/monitor.pm b/perl-install/Xconfig/monitor.pm
index 520b6f1e4..38fa8b3d9 100644
--- a/perl-install/Xconfig/monitor.pm
+++ b/perl-install/Xconfig/monitor.pm
@@ -104,18 +104,18 @@ sub choose {
[ { val => \$merged_name, separator => '|',
list => ['Custom', "Plug'n Play", sort keys %h_monitors],
format => sub { $_[0] eq 'Custom' ? N("Custom") :
- $_[0] eq "Plug'n Play" ? N("Plug'n Play") . " ($monitor->{ModelName})" :
+ $_[0] eq "Plug'n Play" ? N("Plug'n Play") . ($monitor->{VendorName} eq "Plug'n Play" ? " ($monitor->{ModelName})" : '') :
$_[0] =~ /^Generic\|(.*)/ ? N("Generic") . "|$1" :
N("Vendor") . "|$_[0]" },
sort => 0 } ]) or return;
if ($merged_name eq "Plug'n Play") {
local $::noauto = 0; #- hey, you asked for plug'n play, so i do probe!
+ delete @$monitor{'VendorName', 'ModelName', 'EISA_ID'};
put_in_hash($monitor, getinfoFromDDC());
if (configure_automatic($monitor, $monitors)) {
$monitor->{VendorName} = "Plug'n Play";
} else {
- delete $monitor->{VendorName};
$in->ask_warn('', N("Plug'n Play probing failed. Please select the correct monitor"));
goto ask_monitor;
}