From b7f97114d0f3cd0c6e1cfc275f9e054d0f87ac69 Mon Sep 17 00:00:00 2001 From: Pascal Rigaux Date: Tue, 25 Sep 2007 14:12:18 +0000 Subject: - when user asks for "Plug'n Play", silently default to Xorg auto-detection when we fail to auto-detect --- lib/Xconfig/monitor.pm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'lib/Xconfig/monitor.pm') diff --git a/lib/Xconfig/monitor.pm b/lib/Xconfig/monitor.pm index a05d5ee..11ce497 100644 --- a/lib/Xconfig/monitor.pm +++ b/lib/Xconfig/monitor.pm @@ -125,13 +125,13 @@ sub choose { 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'}; + delete @$monitor{'VendorName', 'ModelName', 'EISA_ID', 'HorizSync', 'VertRefresh'}; if ($head_nb <= 1) { - if (my $probed_info = probe($card_Driver)) { + if (my $probed_info = 0 && probe($card_Driver)) { put_in_hash($monitor, $probed_info); } else { - $in->ask_warn('', N("Plug'n Play probing failed. Please select the correct monitor")); - goto ask_monitor; + log::l("Plug'n Play probing failed, but Xorg may do better"); + $monitor->{VendorName} = "Plug'n Play"; } } else { $monitor->{VendorName} = "Plug'n Play"; -- cgit v1.2.1