From 4477f2cf41cad3af5668d4c7a04fb61c06cd2b03 Mon Sep 17 00:00:00 2001
From: Pascal Rigaux <pixel@mandriva.com>
Date: Tue, 22 Jan 2002 12:59:13 +0000
Subject: fix a few cancel's (reported by slegros)

---
 perl-install/install_steps_interactive.pm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'perl-install/install_steps_interactive.pm')

diff --git a/perl-install/install_steps_interactive.pm b/perl-install/install_steps_interactive.pm
index 527bed9f9..912493870 100644
--- a/perl-install/install_steps_interactive.pm
+++ b/perl-install/install_steps_interactive.pm
@@ -670,7 +670,7 @@ sub chooseGroups {
 
 	#- ask user for its choice.
 	$type = $o->ask_from_list_(_("Type of install"), _("You do not have selected any group of packages
-Please choose the minimal installation you want"), [ __("Base system only"), __("No X"), __("With X"), ], $type);
+Please choose the minimal installation you want"), [ __("Base system only"), __("No X"), __("With X"), ], $type) or return &chooseGroups;
 
 	#- reselect according to user selection.
 	if ($type eq __("Base system only")) {
@@ -952,7 +952,7 @@ sub configureTimezone {
     my ($o, $clicked) = @_;
 
     require timezone;
-    $o->{timezone}{timezone} = $o->ask_from_treelist('', _("Which is your timezone?"), '/', [ timezone::getTimeZones($::g_auto_install ? '' : $o->{prefix}) ], $o->{timezone}{timezone});
+    $o->{timezone}{timezone} = $o->ask_from_treelist('', _("Which is your timezone?"), '/', [ timezone::getTimeZones($::g_auto_install ? '' : $o->{prefix}) ], $o->{timezone}{timezone}) || return;
     $o->set_help('configureTimezoneGMT');
 
     my $ntp = to_bool($o->{timezone}{ntp});
-- 
cgit v1.2.1