diff options
| author | Thierry Vignaud <tv@mageia.org> | 2012-06-05 10:39:41 +0000 |
|---|---|---|
| committer | Thierry Vignaud <tv@mageia.org> | 2012-06-05 10:39:41 +0000 |
| commit | 11725a1223710416dd3e2d26295d0b390274c3c8 (patch) | |
| tree | 65b7e501cb1fc6fe00a4411c0849052c00dbd8e8 | |
| parent | 017ba3703aded6d7366bdfdeffc879596694ae98 (diff) | |
| download | drakx-11725a1223710416dd3e2d26295d0b390274c3c8.tar drakx-11725a1223710416dd3e2d26295d0b390274c3c8.tar.gz drakx-11725a1223710416dd3e2d26295d0b390274c3c8.tar.bz2 drakx-11725a1223710416dd3e2d26295d0b390274c3c8.tar.xz drakx-11725a1223710416dd3e2d26295d0b390274c3c8.zip | |
fix detecting if Xorg started successfully
| -rw-r--r-- | perl-install/install/NEWS | 2 | ||||
| -rw-r--r-- | perl-install/install/steps_gtk.pm | 2 |
2 files changed, 3 insertions, 1 deletions
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; |