summaryrefslogtreecommitdiffstats
path: root/lib/Xconfig/resolution_and_depth.pm
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2007-10-04 08:09:05 +0000
committerPascal Rigaux <pixel@mandriva.com>2007-10-04 08:09:05 +0000
commit3a83f6a6bbc472e51c9c4da90f0c920cd96d0262 (patch)
tree8b196b211fb23f06254fb6167a6667ff67b996fa /lib/Xconfig/resolution_and_depth.pm
parentce5313e1cf731590284093a9f6e87f58b846193b (diff)
downloaddrakx-kbd-mouse-x11-3a83f6a6bbc472e51c9c4da90f0c920cd96d0262.tar
drakx-kbd-mouse-x11-3a83f6a6bbc472e51c9c4da90f0c920cd96d0262.tar.gz
drakx-kbd-mouse-x11-3a83f6a6bbc472e51c9c4da90f0c920cd96d0262.tar.bz2
drakx-kbd-mouse-x11-3a83f6a6bbc472e51c9c4da90f0c920cd96d0262.tar.xz
drakx-kbd-mouse-x11-3a83f6a6bbc472e51c9c4da90f0c920cd96d0262.zip
- better fix for typo in 0.32: don't wrongly default to "automatic" resolution
when creating xorg.conf (in non --auto)
Diffstat (limited to 'lib/Xconfig/resolution_and_depth.pm')
-rw-r--r--lib/Xconfig/resolution_and_depth.pm4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/Xconfig/resolution_and_depth.pm b/lib/Xconfig/resolution_and_depth.pm
index 0d7715e..2847e6b 100644
--- a/lib/Xconfig/resolution_and_depth.pm
+++ b/lib/Xconfig/resolution_and_depth.pm
@@ -195,9 +195,9 @@ sub choices {
}
sub configure {
- my ($in, $raw_X, $card, $monitors, $b_auto) = @_;
+ my ($in, $raw_X, $card, $monitors, $b_auto, $o_resolution) = @_;
- my ($default_resolution, @resolutions) = choices($raw_X, $raw_X->get_resolution, $card, $monitors);
+ my ($default_resolution, @resolutions) = choices($raw_X, $o_resolution || $raw_X->get_resolution, $card, $monitors);
if ($b_auto) {
#- use $default_resolution