diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 2002-07-31 20:05:13 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 2002-07-31 20:05:13 +0000 |
| commit | 5f03757d7b26bc05792239210c88d9b2e7ab2205 (patch) | |
| tree | 579bea608ede5127b26a752c844275a0b22c4bc1 | |
| parent | 8b5271483157d2e747db5dcdd8624ee4b5705fff (diff) | |
| download | drakx-5f03757d7b26bc05792239210c88d9b2e7ab2205.tar drakx-5f03757d7b26bc05792239210c88d9b2e7ab2205.tar.gz drakx-5f03757d7b26bc05792239210c88d9b2e7ab2205.tar.bz2 drakx-5f03757d7b26bc05792239210c88d9b2e7ab2205.tar.xz drakx-5f03757d7b26bc05792239210c88d9b2e7ab2205.zip | |
handle cancel in xfree_and_glx_choose
| -rw-r--r-- | perl-install/Xconfig/card.pm | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/perl-install/Xconfig/card.pm b/perl-install/Xconfig/card.pm index 63b79aa93..3d993dd48 100644 --- a/perl-install/Xconfig/card.pm +++ b/perl-install/Xconfig/card.pm @@ -154,7 +154,7 @@ sub probe() { foreach (@cards) { $_->{MULTI_HEAD} && $_->{card_name} =~ /G[24]00/ or next; if ($ENV{MATROX_HAL}) { -# $_->{need_MATROX_HAL} = 1; + $_->{need_MATROX_HAL} = 1; } else { delete $_->{MULTI_HEAD}; } @@ -273,7 +273,7 @@ sub configure { card_config__not_listed($in, $card, $options) or return; } - xfree_and_glx_choose($in, $card, $auto); + xfree_and_glx_choose($in, $card, $auto) or return; $card->{prog} = install_server($card, $options, $do_pkgs); @@ -345,6 +345,7 @@ sub xfree_and_glx_choose { log::l("Using $tc->{text}"); $tc->{code}(); set_glx_restrictions($card); + 1; } sub multi_head_choices { |