summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tvignaud@mandriva.org>2005-05-22 10:08:01 +0000
committerThierry Vignaud <tvignaud@mandriva.org>2005-05-22 10:08:01 +0000
commitb965950286c29c1777c89346c63b2c91be23a9f2 (patch)
tree28106f7e86960342b78db5f65d6323f80d64462d
parent91287b65dee7089530587e6a4558ea686a636a33 (diff)
downloaddrakx-b965950286c29c1777c89346c63b2c91be23a9f2.tar
drakx-b965950286c29c1777c89346c63b2c91be23a9f2.tar.gz
drakx-b965950286c29c1777c89346c63b2c91be23a9f2.tar.bz2
drakx-b965950286c29c1777c89346c63b2c91be23a9f2.tar.xz
drakx-b965950286c29c1777c89346c63b2c91be23a9f2.zip
fix canceling managment in text mode
-rw-r--r--perl-install/interactive/newt.pm4
1 files changed, 2 insertions, 2 deletions
diff --git a/perl-install/interactive/newt.pm b/perl-install/interactive/newt.pm
index 427524668..5b6c02005 100644
--- a/perl-install/interactive/newt.pm
+++ b/perl-install/interactive/newt.pm
@@ -316,7 +316,7 @@ sub ask_fromW_real {
my ($need_to_die);
if (!defined $cancel && !defined $ok) {
$cancel = $::isWizard && !$::Wizard_no_previous ? N("Previous") : N("Cancel") ;
- $need_to_die = 1;
+ $need_to_die = 1 if !($::isWizard && !$::Wizard_no_previous);
}
$ok ||= $::isWizard ? ($::Wizard_finished ? N("Finish") : N("Next")) : N("Ok");
@@ -377,7 +377,7 @@ sub ask_fromW_real {
$form->FormDestroy;
Newt::PopWindow();
- die 'wizcancel' if $need_to_die;
+ die 'wizcancel' if $need_to_die && $canceled;
!$canceled;
}