From 8cd320d720618b7b883d50d1d3cfd5c1662d61e6 Mon Sep 17 00:00:00 2001
From: Thierry Vignaud <tvignaud@mandriva.org>
Date: Wed, 11 Sep 2002 09:01:43 +0000
Subject: - fix: we displayed current driver as default one: display the right
 one - show a wait message while switching driver

---
 perl-install/harddrake/sound.pm | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'perl-install/harddrake/sound.pm')

diff --git a/perl-install/harddrake/sound.pm b/perl-install/harddrake/sound.pm
index 321d5e934..4ba774be5 100644
--- a/perl-install/harddrake/sound.pm
+++ b/perl-install/harddrake/sound.pm
@@ -157,8 +157,9 @@ sub do_switch {
 
 sub switch {
     my ($in, $device) = @_;
-    my $driver = $device->{driver};
-    $driver = modules::get_alias($driver) if $driver =~ /sound-card/; # alsaconf ...
+    my $driver = $device->{current_driver};
+    $driver = $device->{driver} unless $driver;
+
     foreach (@blacklist) { $blacklisted = 1 if $driver eq $_ }
     my $alternative = get_alternative($driver);
     if ($alternative) {
@@ -199,7 +200,9 @@ To use alsa, one can either use:
 		  $in->ask_warn(_("Warning"), _("The old \"%s\" driver is blacklisted.\n
 It has been reported to oopses the kernel on unloading.\n
 The new \"%s\" driver'll only be used on next bootstrap.", $driver, $new_driver)) if $blacklisted;
+		  my $wait = $in->wait_message(_("Please wait"),_("Please Wait... Applying the configuration"));
 		  do_switch($driver, $new_driver);
+		  undef $wait;
 	   }
     } elsif ($driver eq "unknown") {
 	   $in->ask_warn(_("No known driver"), 
-- 
cgit v1.2.1