diff options
| -rw-r--r-- | perl-install/Xconfigurator.pm | 4 | ||||
| -rw-r--r-- | perl-install/install_steps_interactive.pm | 3 | ||||
| -rw-r--r-- | perl-install/printerdrake.pm | 5 |
3 files changed, 6 insertions, 6 deletions
diff --git a/perl-install/Xconfigurator.pm b/perl-install/Xconfigurator.pm index ebabc5830..975fb0cf3 100644 --- a/perl-install/Xconfigurator.pm +++ b/perl-install/Xconfigurator.pm @@ -253,7 +253,7 @@ Do You want to use XFree 3.3 instead of XFree 4.0?"), 1) and $card->{use_xf4} = if (!$::isStandalone && $card->{driver} eq "i810") { require modules; - modules::load("agpgart"); }; + eval { modules::load("agpgart"); }; } $card; } @@ -474,7 +474,7 @@ sub autoDefaultDepth($$) { my ($card, $wres_wanted) = @_; my ($best, $depth); - return 24 if $card->{identifier} =~ /SiS/; #- assume 24 bit event for 3D acceleration (not enabled currently). + return 24 if $card->{identifier} =~ /SiS/; #- assume 24 bit even for 3D acceleration (not enabled currently). return 16 if $card->{Utah_glx} || $card->{DRI_glx}; #- assume 16bit as most of them need 16. for ($card->{server}) { diff --git a/perl-install/install_steps_interactive.pm b/perl-install/install_steps_interactive.pm index 2ed1858c1..ee35a5282 100644 --- a/perl-install/install_steps_interactive.pm +++ b/perl-install/install_steps_interactive.pm @@ -574,7 +574,8 @@ sub configurePrinter { $o->{printer}{mode} = $o->ask_from_list_([''], _("What printing system do you want to use?"), [ 'cups', 'lpr', __("Cancel") ], ); - $o->{printer}{mode} eq 'Cancel' and $o->{printer}{mode} = undef, return; + $o->{printer}{want} = $o->{printer}{mode} ne 'Cancel'; + $o->{printer}{want} or $o->{printer}{mode} = undef, return; } $o->{printer}{PAPERSIZE} = $o->{lang} eq 'en' ? 'letter' : 'a4'; diff --git a/perl-install/printerdrake.pm b/perl-install/printerdrake.pm index f7bbb254a..fae5f3cf5 100644 --- a/perl-install/printerdrake.pm +++ b/perl-install/printerdrake.pm @@ -327,9 +327,8 @@ sub main($$$;$) { while ($continue) { if ($::beginner || !(scalar keys %{$printer->{configured} || {}})) { - $queue = $printer->{configured}{lp} || $in->ask_yesorno(_("Printer"), - _("Would you like to configure a printer?"), - $printer->{want}) ? 'lp' : 'Done'; + $queue = $printer->{want} || $in->ask_yesorno(_("Printer"), + _("Would you like to configure a printer?"), 0) ? 'lp' : 'Done'; } else { $queue = $in->ask_from_list_([''], _("Here are the following print queues. |