From a9de3d40e931ae5727f7011ee4b6cf86bac7b8af Mon Sep 17 00:00:00 2001
From: Pascal Rigaux <pixel@mandriva.com>
Date: Wed, 8 Sep 1999 11:40:40 +0000
Subject: no_comment

---
 perl-install/interactive.pm     | 16 ++++++++--------
 perl-install/interactive_gtk.pm |  1 +
 2 files changed, 9 insertions(+), 8 deletions(-)

(limited to 'perl-install')

diff --git a/perl-install/interactive.pm b/perl-install/interactive.pm
index 4cf9ef95b..44fcae50f 100644
--- a/perl-install/interactive.pm
+++ b/perl-install/interactive.pm
@@ -126,14 +126,14 @@ sub ask_from_entries_ref($$$$;$%) {
     my ($o, $title, $message, $l, $val, %callback) = @_;
     
     $message = ref $message ? $message : [ $message ];
-    my $val_hash = [ map 
-		     { if ((ref $_) eq "SCALAR") {
-			 { val => $_ }
-		     } else {
-			 ($_->{list} && @{$_->{list}}) ?
-			   { %{$_}, type => "list"} : $_
-		       }
-		   } @{$val} ];
+    my $val_hash = [ map {
+	if ((ref $_) eq "SCALAR") {
+	    { val => $_ }
+	} else {
+	    ($_->{list} && @{$_->{list}}) ?
+	      { %{$_}, type => "list"} : $_;
+	}
+    } @$val ];
 
     $o->ask_from_entries_refW($title, $message, $l, $val_hash, %callback)
     
diff --git a/perl-install/interactive_gtk.pm b/perl-install/interactive_gtk.pm
index 12ff75ac4..1afb5b420 100644
--- a/perl-install/interactive_gtk.pm
+++ b/perl-install/interactive_gtk.pm
@@ -180,6 +180,7 @@ sub ask_from_entries_refW {
 	    foreach (@updates_inv) { &{$_};}
 	    $ignore = 0;
 	    if ($error) {
+		$focus ||= 0;
 		comb_entry($entries[$focus], $val->[$focus])->grab_focus();
 	    } else {
 		return 1;
-- 
cgit v1.2.1