- when user asks for "Plug'n Play", silently default to Xorg auto-detection

  when we fail to auto-detect

2 files changed, 8 insertions, 4 deletions

diff --git a/NEWS b/NEWS
index 9d2f49f..8e966ad 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,7 @@
+- add support for "Automatic" resolution (aka "let xorg do everything")
+- when user asks for "Plug'n Play", silently default to Xorg auto-detection
+  when we fail to auto-detect
+
 Version 0.29 - 21 September 2007, by Olivier "blino" Blin
 
 - unload drivers loaded by monitor-probe-using-X
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";