diff options
| author | Julien Cristau <jcristau@debian.org> | 2010-01-11 00:31:27 +0000 |
|---|---|---|
| committer | Peter Hutterer <peter.hutterer@who-t.net> | 2010-01-19 10:44:32 +1300 |
| commit | 2993d3fc96af0b58788415ad5c2d229eacc530f4 (patch) | |
| tree | 31747e34d39e08b0b250b5ee465ca92b551b92f2 | |
| parent | aa6d593299581f941c625945a536837103b1ddce (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.c | 2 |
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); |