From 8400ba52c3e7b1f7117204322c43bece444f8c80 Mon Sep 17 00:00:00 2001
From: Thierry Vignaud <tvignaud@mandriva.org>
Date: Mon, 2 Sep 2002 13:32:42 +0000
Subject: display alternative drivers (oss, alsa) for sound cards

---
 perl-install/harddrake/sound.pm |   9 +++++----
 perl-install/harddrake/ui.pm    | Bin 9932 -> 10255 bytes
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/perl-install/harddrake/sound.pm b/perl-install/harddrake/sound.pm
index 2f235d711..59c0b68ba 100644
--- a/perl-install/harddrake/sound.pm
+++ b/perl-install/harddrake/sound.pm
@@ -151,7 +151,7 @@ sub switch {
     my $alternative = get_alternative($driver);
     if ($alternative) {
 	   my $new_driver = $alternative->[0];
-	   if ($new_driver eq "unknown") {
+	   if ($new_driver eq 'unknown') {
 		  $in->ask_warn(_("No alternative driver"),
 							_("There's no known OSS/ALSA alternative driver for your sound card (%s)",
 							  $device->{description}));
@@ -165,6 +165,7 @@ sub switch {
 						  }, allow_empty_list => 1 }
 						  ]))
 	   {
+		  return if ($new_driver eq $driver);
 		  standalone::explanations("switching audio driver from '$driver' to '$new_driver'\n");
 		  do_switch($driver, $new_driver);
 	   }
@@ -176,9 +177,9 @@ sub switch {
 	   $in->ask_warn(_("Unkown driver"), 
 							 _("The \"%s\" driver for your sound card is unlisted\n
 Please send the output of the \"lspcidrake -v\" command to
-Thierry Vignaud <tvignaud at mandrakesoft dot com>
-with subject: unlisted sound driver")
-							   , $driver);
+<install at mandrakesoft dot com>
+with subject: unlisted sound driver \"%s\"")
+							   , $driver, $driver);
     }
 }
 
diff --git a/perl-install/harddrake/ui.pm b/perl-install/harddrake/ui.pm
index b7202a57b..24bd5c3ff 100644
Binary files a/perl-install/harddrake/ui.pm and b/perl-install/harddrake/ui.pm differ
-- 
cgit v1.2.1