diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 2000-02-24 20:26:03 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 2000-02-24 20:26:03 +0000 |
| commit | 5d8ade57924225234cbeae6eff2c6e84258f73e9 (patch) | |
| tree | cf7b18fb87f933fcd5be0a55898ac7d53c4390db /perl-install/install_steps_gtk.pm | |
| parent | 78aef7f66bb62da23ff87ba2f24fb5e33637c0be (diff) | |
| download | drakx-5d8ade57924225234cbeae6eff2c6e84258f73e9.tar drakx-5d8ade57924225234cbeae6eff2c6e84258f73e9.tar.gz drakx-5d8ade57924225234cbeae6eff2c6e84258f73e9.tar.bz2 drakx-5d8ade57924225234cbeae6eff2c6e84258f73e9.tar.xz drakx-5d8ade57924225234cbeae6eff2c6e84258f73e9.zip | |
no_comment
Diffstat (limited to 'perl-install/install_steps_gtk.pm')
| -rw-r--r-- | perl-install/install_steps_gtk.pm | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/perl-install/install_steps_gtk.pm b/perl-install/install_steps_gtk.pm index b07ccc1e7..520abe4f3 100644 --- a/perl-install/install_steps_gtk.pm +++ b/perl-install/install_steps_gtk.pm @@ -179,7 +179,7 @@ sub new($$) { exec $_[0], "-dpms","-s" ,"240", "-allowMouseOpenFail", "-xf86config", $f or exit 1; } foreach (1..15) { - sleep 1; + sleep 1000; return 0 if !$ok; return 1 if c::Xtest($ENV{DISPLAY}); } @@ -210,15 +210,16 @@ sub new($$) { !$o->{vga16} && listlength(cat_("/proc/fb")) or next; $o->{allowFB} = &$launchX("XF86_$_") #- keep in mind FB is used. - and last; + and goto OK; } else { $o->{vga16} = 1 if /VGA16/; - &$launchX("XF86_$_") and last; + &$launchX("XF86_$_") and goto OK; } } + return undef; } } - @themes = @themes_vga16 if $o->{simple_themes} || $o->{vga16}; + OK: @themes = @themes_vga16 if $o->{simple_themes} || $o->{vga16}; init_sizes(); install_theme($o); |