From 231f5086cc1b833b8b7e2665041a22be17d9ead4 Mon Sep 17 00:00:00 2001
From: Pascal Rigaux <pixel@mandriva.com>
Date: Fri, 6 Sep 2002 10:37:09 +0000
Subject: ensure Xconfig::various::various is called at install

---
 perl-install/Xconfig/main.pm | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'perl-install/Xconfig/main.pm')

diff --git a/perl-install/Xconfig/main.pm b/perl-install/Xconfig/main.pm
index f4729b6c8..d7fd47eaf 100644
--- a/perl-install/Xconfig/main.pm
+++ b/perl-install/Xconfig/main.pm
@@ -59,9 +59,9 @@ sub configure_everything {
 
     if (!$ok) {
 	($ok) = configure_chooser_raw($in, $raw_X, $do_pkgs, $options, $X, 1);
-    } else {
-	Xconfig::various::various($in, $X->{card}, $options, $auto);
     }
+    $X->{various} ||= Xconfig::various::various($in, $X->{card}, $options, $auto);
+
     $ok = may_write($in, $raw_X, $X, $ok);
     
     $ok && 'config_changed';
@@ -117,6 +117,7 @@ sub configure_chooser_raw {
 			),
 		    { val => _("Options"), icon => "ic82-tape-40", clicked => sub {
 			  Xconfig::various::various($in, $X->{card}, $options);
+			  $X->{various} = 'done';
 		      } },
 		    { val => $::isInstall ? _("Ok") : _("Quit"), icon => "exit", clicked_may_quit => sub { 1 } },
 		   ]);
-- 
cgit v1.2.1