From 3dd4b6420f686b0147d5b8136268cc63196e253b Mon Sep 17 00:00:00 2001
From: marha <marha@users.sourceforge.net>
Date: Sun, 9 Mar 2014 21:32:55 +0100
Subject: fontconfig mesa xserver git update 9 Mar 2014

xserver          commit 1c61d38528a573caadee2468ee59ea558c822e09
fontconfig       commit f8ccf379eb1092592ae0b65deb563c5491f69de9
mesa             commit 897f40f25d21af678b1b67c1a68c4a6722d19983
---
 xorg-server/dix/main.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'xorg-server/dix/main.c')

diff --git a/xorg-server/dix/main.c b/xorg-server/dix/main.c
index fcc1ad30a..7427e08ca 100644
--- a/xorg-server/dix/main.c
+++ b/xorg-server/dix/main.c
@@ -175,6 +175,9 @@ dix_main(int argc, char *argv[], char *envp[])
         clients[0] = serverClient;
         currentMaxClients = 1;
 
+        /* clear any existing selections */
+        InitSelections();
+
         /* Initialize privates before first allocation */
         dixResetPrivates();
 
@@ -192,7 +195,6 @@ dix_main(int argc, char *argv[], char *envp[])
 
         InitAtoms();
         InitEvents();
-        InitSelections();
         InitGlyphCaching();
         dixResetRegistry();
         ResetFontPrivateIndex();
-- 
cgit v1.2.3