aboutsummaryrefslogtreecommitdiff
path: root/xorg-server/dix/main.c
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2010-02-11 09:21:04 +0000
committermarha <marha@users.sourceforge.net>2010-02-11 09:21:04 +0000
commit4268e59d0c18a7bfc584189d3418765407d05bbf (patch)
treed8df9d476531dce6fdcd3ff58c5fd62da0daa7a9 /xorg-server/dix/main.c
parent7fe172c9035f56977209da12a7fd67d8badd71a2 (diff)
downloadvcxsrv-4268e59d0c18a7bfc584189d3418765407d05bbf.tar.gz
vcxsrv-4268e59d0c18a7bfc584189d3418765407d05bbf.tar.bz2
vcxsrv-4268e59d0c18a7bfc584189d3418765407d05bbf.zip
Git update 11/2/2010
Diffstat (limited to 'xorg-server/dix/main.c')
-rw-r--r--xorg-server/dix/main.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/xorg-server/dix/main.c b/xorg-server/dix/main.c
index d4db90c75..da910fe4b 100644
--- a/xorg-server/dix/main.c
+++ b/xorg-server/dix/main.c
@@ -255,9 +255,9 @@ int main(int argc, char *argv[], char *envp[])
InitRootWindow(WindowTable[i]);
InitCoreDevices();
- config_init();
InitInput(argc, argv);
InitAndStartDevices();
+ config_init();
dixSaveScreens(serverClient, SCREEN_SAVER_FORCER, ScreenSaverReset);