diff options
| author | marha <marha@users.sourceforge.net> | 2014-03-09 22:56:02 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2014-03-09 22:56:02 +0100 |
| commit | 2112b7dec49833ba872bd3ebcd7288930fec0796 (patch) | |
| tree | 407c80c9a70f590af2d4c3e5c14678827e189331 /xorg-server/dix | |
| parent | 8badbdef38ce843dc443ddee219eda4040ef2cd5 (diff) | |
| parent | 3dd4b6420f686b0147d5b8136268cc63196e253b (diff) | |
| download | vcxsrv-2112b7dec49833ba872bd3ebcd7288930fec0796.tar.gz vcxsrv-2112b7dec49833ba872bd3ebcd7288930fec0796.tar.bz2 vcxsrv-2112b7dec49833ba872bd3ebcd7288930fec0796.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
fontconfig mesa xserver git update 9 Mar 2014
Conflicts:
mesalib/src/mapi/glapi/glapi.h
xorg-server/hw/kdrive/ephyr/hostx.c
Diffstat (limited to 'xorg-server/dix')
| -rw-r--r-- | xorg-server/dix/main.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/xorg-server/dix/main.c b/xorg-server/dix/main.c index 5f499741c..84c47d46e 100644 --- a/xorg-server/dix/main.c +++ b/xorg-server/dix/main.c @@ -220,6 +220,9 @@ dix_main(int argc, char *argv[], char *envp[]) currentMaxClients = 1; OsInit(); + /* clear any existing selections */ + InitSelections(); + /* Initialize privates before first allocation */ dixResetPrivates(); @@ -237,7 +240,6 @@ dix_main(int argc, char *argv[], char *envp[]) InitAtoms(); InitEvents(); - InitSelections(); InitGlyphCaching(); dixResetRegistry(); ResetFontPrivateIndex(); |