From a2881ea1c717d7c3ab60c4bcc477293489bd8f8d Mon Sep 17 00:00:00 2001
From: Thierry Vignaud <tv@mageia.org>
Date: Thu, 5 Apr 2012 17:42:02 +0000
Subject: (install_server) fix loading functions

thus fixing crash introduced by anssi in r3925
["Fix firmware handling (it is DRIVER which needs it, not DRIVER2)"]
---
 NEWS                | 2 ++
 lib/Xconfig/card.pm | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/NEWS b/NEWS
index 44667f6..1ec4c35 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,5 @@
+- fix crash introduced in 0.100 (mga#5238)
+
 Version 0.100 - 05 April 2012
 
 - do not run setxkbmap during text install
diff --git a/lib/Xconfig/card.pm b/lib/Xconfig/card.pm
index 8364dc8..cf07001 100644
--- a/lib/Xconfig/card.pm
+++ b/lib/Xconfig/card.pm
@@ -316,8 +316,8 @@ sub install_server {
 	delete $card->{Driver2};
     }
 
+    require Xconfig::proprietary;
     if ($card->{Driver2}) {       
-	require Xconfig::proprietary;
 	Xconfig::proprietary::handle_DRIVER2_NO_SSE($card);
 	my @pkgs = Xconfig::proprietary::pkgs_for_Driver2($card->{Driver2}, $do_pkgs);
 	if (@pkgs && (!$o_in || $o_in->ask_yesorno('', formatAlaTeX(N("There is a proprietary driver available for your video card which may support additional features.
-- 
cgit v1.2.1