summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2007-09-28 16:21:57 +0000
committerPascal Rigaux <pixel@mandriva.com>2007-09-28 16:21:57 +0000
commit2c94319f843e60f52c8b3e5621cb038753a9e76d (patch)
treebf9c4cd6072e58133490ecf4c72c13aea7caccdb
parente73922b5b019a5415f56cc4f3f504f4f35874bad (diff)
downloaddrakx-kbd-mouse-x11-2c94319f843e60f52c8b3e5621cb038753a9e76d.tar
drakx-kbd-mouse-x11-2c94319f843e60f52c8b3e5621cb038753a9e76d.tar.gz
drakx-kbd-mouse-x11-2c94319f843e60f52c8b3e5621cb038753a9e76d.tar.bz2
drakx-kbd-mouse-x11-2c94319f843e60f52c8b3e5621cb038753a9e76d.tar.xz
drakx-kbd-mouse-x11-2c94319f843e60f52c8b3e5621cb038753a9e76d.zip
- fix typo in 0.32: don't wrongly default to "automatic" resolution when
creating xorg.conf (in non --auto)
-rw-r--r--NEWS2
-rw-r--r--lib/Xconfig/xfree.pm3
2 files changed, 4 insertions, 1 deletions
diff --git a/NEWS b/NEWS
index 7e6c56e..cc8a91d 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,8 @@
- we don't set ModulesPath to DRI_GLX_SPECIAL value, so we must read it
differently so that Xconfig::various::info() is correct (#31326)
- add support for x11-driver-input-vboxmouse when inside a VirtualBox guest
+- fix typo in 0.32: don't wrongly default to "automatic" resolution when
+ creating xorg.conf (in non --auto)
Version 0.32 - 26 September 2007, by Pascal "Pixel" Rigaux
diff --git a/lib/Xconfig/xfree.pm b/lib/Xconfig/xfree.pm
index ab9d3b5..df53ea6 100644
--- a/lib/Xconfig/xfree.pm
+++ b/lib/Xconfig/xfree.pm
@@ -188,7 +188,8 @@ sub get_resolutions {
my $Screen = $o_Screen || $raw_X->get_default_screen or return {};
my $depth = val($Screen->{DefaultColorDepth} || $Screen->{DefaultDepth});
- my $Display = find { !$depth || val($_->{l}{Depth}) eq $depth } @{$Screen->{Display} || []} or return { automatic => 1 };
+ my $Displays = $Screen->{Display} or return {};
+ my $Display = find { !$depth || val($_->{l}{Depth}) eq $depth } @$Displays or return { automatic => 1 };
my $s = val($Display->{l}{Virtual} || $Display->{l}{Modes});
my @l;
while ($s =~ /(\d+)(x|\s+)(\d+)/g) {