From 45e2c4a8a65a60291e176a5606707216fb8a3490 Mon Sep 17 00:00:00 2001
From: Francois Pons <fpons@mandriva.com>
Date: Fri, 23 Mar 2001 19:06:37 +0000
Subject: fixed screen id for Device to be present whenever the same BusID is
 used.

---
 perl-install/Xconfigurator.pm | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'perl-install')

diff --git a/perl-install/Xconfigurator.pm b/perl-install/Xconfigurator.pm
index ab185daf4..8c37dce50 100644
--- a/perl-install/Xconfigurator.pm
+++ b/perl-install/Xconfigurator.pm
@@ -176,7 +176,6 @@ sub cardConfigurationAuto() {
 		       foreach (1..$dup) {
 			   my $card = {};
 			   add2hash($card, $orig);
-			   $card->{screen} = $_ - 1;
 			   push @result, $card;
 		       }
 		       @result;
@@ -221,6 +220,11 @@ sub cardConfiguration(;$$$) {
 		log::l("found card \"$_->{identifier}\" not supported by XF4, disabling mutli-head support");
 		$configure_multi_head = undef;
 	    }
+	    #- if more than one card use the same BusID, we have to use screen.
+	    if ($single_heads{$_->{busid}}) {
+		$single_heads{$_->{busid}}{screen} ||= 0;
+		$_->{screen} = $single_heads{$_->{busid}}{screen} + 1;
+	    }
 	    $single_heads{$_->{busid}} = $_;
 	}
 	if ($configure_multi_head) {
-- 
cgit v1.2.1