[PATCH] main: move config_init() after InitInput()

Julien Cristau jcristau at debian.org
Sun Jan 10 16:31:27 PST 2010


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 at googlemail.com>
Signed-off-by: Julien Cristau <jcristau at debian.org>
---
 dix/main.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/dix/main.c b/dix/main.c
index d4db90c..da910fe 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);
 
-- 
1.6.6



More information about the xorg-devel mailing list