From b2bd810556ad9f0468b08c76e86e575ef1a1458c Mon Sep 17 00:00:00 2001
From: Thierry Vignaud <tvignaud@mandriva.org>
Date: Wed, 18 May 2005 06:21:15 +0000
Subject: handle 'wizcancel'

---
 perl-install/interactive/newt.pm | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'perl-install/interactive')

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;
 }
 
-- 
cgit v1.2.1