summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJulien Cristau <jcristau@debian.org>2010-01-11 00:31:27 +0000
committerPeter Hutterer <peter.hutterer@who-t.net>2010-02-05 10:38:52 +1000
commit901c4ebf620579c5bb951a8c003430d967ecf2ff (patch)
treec140e25b175d6e0578a0220ab6bc4f0292ad61ce
parent7f648777680b9dea31c4adb657e205fc6880d98b (diff)
main: move config_init() after InitInput()
With the udev backend, config_init() calls NewInputDeviceRequest(), which enables devices. They can then start sending events, even though the event queue is only initialized later in InitInput(). Oops. Debian bug#564256 <http://bugs.debian.org/564256> Reported-by: Sedat Dilek <sedat.dilek@googlemail.com> Signed-off-by: Julien Cristau <jcristau@debian.org> Tested-by: Sedat Dilek <sedat.dilek@googlemail.com> Reviewed-by: Adam Jackson <ajax@redhat.com> Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
-rw-r--r--dix/main.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/dix/main.c b/dix/main.c
index d4db90c75..da910fe4b 100644
--- a/dix/main.c
+++ b/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);