From 79a34036b86e79ea7f1b4983cce15edaafc932fc Mon Sep 17 00:00:00 2001
From: Pascal Rigaux <pixel@mandriva.com>
Date: Wed, 6 Nov 2002 19:36:59 +0000
Subject: when needVideoRam, don't take the raw value VideoRam_probed, better
 take a known value <= VideoRam_probed

---
 perl-install/Xconfig/card.pm | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/perl-install/Xconfig/card.pm b/perl-install/Xconfig/card.pm
index e35df200b..5e397e65d 100644
--- a/perl-install/Xconfig/card.pm
+++ b/perl-install/Xconfig/card.pm
@@ -283,13 +283,15 @@ sub configure {
 
     $card->{prog} = install_server($card, $options, $do_pkgs);
     
-    $in->ask_from('', N("Select the memory size of your graphics card"),
-		  [ { val => \ ($card->{VideoRam} = $options->{VideoRam_probed} || 4096),
-		      type => 'list',
-		      list => [ ikeys %VideoRams ],
-		      format => sub { translate($VideoRams{$_[0]}) },
-		      not_edit => !$::expert } ]) or return
-			if $card->{needVideoRam} && !$card->{VideoRam};
+    if ($card->{needVideoRam} && !$card->{VideoRam}) {
+	$card->{VideoRam} = first(grep { $_ <= $options->{VideoRam_probed} } reverse ikeys %VideoRams) || 4096;
+	$in->ask_from('', N("Select the memory size of your graphics card"),
+		      [ { val => \$card->{VideoRam},
+			  type => 'list',
+			  list => [ ikeys %VideoRams ],
+			  format => sub { translate($VideoRams{$_[0]}) },
+			  not_edit => !$::expert } ]) or return;
+    }
 
     to_raw_X($card, $raw_X);
     $card;
-- 
cgit v1.2.1