From 11725a1223710416dd3e2d26295d0b390274c3c8 Mon Sep 17 00:00:00 2001
From: Thierry Vignaud <tv@mageia.org>
Date: Tue, 5 Jun 2012 10:39:41 +0000
Subject: fix detecting if Xorg started successfully

---
 perl-install/install/NEWS         | 2 ++
 perl-install/install/steps_gtk.pm | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

(limited to 'perl-install')

diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS
index 75488a590..53be0a333 100644
--- a/perl-install/install/NEWS
+++ b/perl-install/install/NEWS
@@ -1,3 +1,5 @@
+- fix detecting if Xorg started successfully
+
 Version 14.25 - 4 June 2012
 
 - fix fallbacking on curses install aka abort gtk install startup if X
diff --git a/perl-install/install/steps_gtk.pm b/perl-install/install/steps_gtk.pm
index a0ddca73e..33ddae6fe 100644
--- a/perl-install/install/steps_gtk.pm
+++ b/perl-install/install/steps_gtk.pm
@@ -93,7 +93,7 @@ sub _setup_and_start_X {
             !$o->{vga16} && $o->{allowFB} or next;
 
             $o->{allowFB} = _launchX($o, $f, $prog, $Driver, $wanted_DISPLAY) #- keep in mind FB is used.
-              and return;
+              and return 1;
         } else {
             $o->{vga16} = 1 if /VGA16/;
             _launchX($o, $f, $prog, $Driver, $wanted_DISPLAY) and return 1;
-- 
cgit v1.2.1