diff options
| author | Thierry Vignaud <tvignaud@mandriva.org> | 2005-05-18 06:21:15 +0000 |
|---|---|---|
| committer | Thierry Vignaud <tvignaud@mandriva.org> | 2005-05-18 06:21:15 +0000 |
| commit | b2bd810556ad9f0468b08c76e86e575ef1a1458c (patch) | |
| tree | c242f5f5c8ab4d4a5ac39b1fd40d842d5699e894 | |
| parent | 2d83725d04a3bae1c64fbb234f161d9ff37a8236 (diff) | |
| download | drakx-b2bd810556ad9f0468b08c76e86e575ef1a1458c.tar drakx-b2bd810556ad9f0468b08c76e86e575ef1a1458c.tar.gz drakx-b2bd810556ad9f0468b08c76e86e575ef1a1458c.tar.bz2 drakx-b2bd810556ad9f0468b08c76e86e575ef1a1458c.tar.xz drakx-b2bd810556ad9f0468b08c76e86e575ef1a1458c.zip | |
handle 'wizcancel'
| -rw-r--r-- | perl-install/interactive/newt.pm | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/perl-install/interactive/newt.pm b/perl-install/interactive/newt.pm index 47d77b54a..427524668 100644 --- a/perl-install/interactive/newt.pm +++ b/perl-install/interactive/newt.pm @@ -313,7 +313,11 @@ sub ask_fromW_real { }; my ($ok, $cancel) = ($common->{ok}, $common->{cancel}); - $cancel = $::isWizard && !$::Wizard_no_previous ? N("Previous") : N("Cancel") if !defined $cancel && !defined $ok; + my ($need_to_die); + if (!defined $cancel && !defined $ok) { + $cancel = $::isWizard && !$::Wizard_no_previous ? N("Previous") : N("Cancel") ; + $need_to_die = 1; + } $ok ||= $::isWizard ? ($::Wizard_finished ? N("Finish") : N("Next")) : N("Ok"); my @okcancel = grep { $_ } $ok, $cancel; @@ -373,6 +377,7 @@ sub ask_fromW_real { $form->FormDestroy; Newt::PopWindow(); + die 'wizcancel' if $need_to_die; !$canceled; } |