diff options
| author | Thierry Vignaud <tvignaud@mandriva.org> | 2003-09-15 22:21:21 +0000 |
|---|---|---|
| committer | Thierry Vignaud <tvignaud@mandriva.org> | 2003-09-15 22:21:21 +0000 |
| commit | 49cdb4136da1c9ddff4bc4a71ddf43ebf9ad1042 (patch) | |
| tree | 09ff10c66029c9f7033278e5d8ff1c64fce07e41 /perl-install/harddrake/sound.pm | |
| parent | 0247f7e03b090f53b2c6ee21fe12920d511f8d62 (diff) | |
| download | drakx-49cdb4136da1c9ddff4bc4a71ddf43ebf9ad1042.tar drakx-49cdb4136da1c9ddff4bc4a71ddf43ebf9ad1042.tar.gz drakx-49cdb4136da1c9ddff4bc4a71ddf43ebf9ad1042.tar.bz2 drakx-49cdb4136da1c9ddff4bc4a71ddf43ebf9ad1042.tar.xz drakx-49cdb4136da1c9ddff4bc4a71ddf43ebf9ad1042.zip | |
show the current driver too (being preselected) so that users do not
get confused
Diffstat (limited to 'perl-install/harddrake/sound.pm')
| -rw-r--r-- | perl-install/harddrake/sound.pm | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/perl-install/harddrake/sound.pm b/perl-install/harddrake/sound.pm index dbade4e7c..0996d9001 100644 --- a/perl-install/harddrake/sound.pm +++ b/perl-install/harddrake/sound.pm @@ -143,6 +143,7 @@ sub get_alternative { sub do_switch { my ($in, $old_driver, $new_driver, $index) = @_; + return if $old_driver eq $new_driver; my $_wait = $in->wait_message(N("Please wait"), N("Please Wait... Applying the configuration")); log::explanations("removing old $old_driver\n"); rooted("service sound stop") unless $blacklisted; @@ -168,7 +169,8 @@ sub switch { foreach (@blacklist) { $blacklisted = 1 if $driver eq $_ } my $alternative = get_alternative($driver); if ($alternative) { - my $new_driver = $alternative->[0]; + my $new_driver = $driver; + push @$alternative, $driver; if ($new_driver eq 'unknown') { $in->ask_from(N("No alternative driver"), N("There's no known OSS/ALSA alternative driver for your sound card (%s) which currently uses \"%s\"", |