summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFernando Carrijo <fcarrijo@yahoo.com.br>2010-08-14 06:46:28 -0300
committerFernando Carrijo <fcarrijo@yahoo.com.br>2010-08-14 06:46:28 -0300
commit39c3af6ab4de25c7e5aa890246ca04c4cf84f0fa (patch)
tree463703c60930698d9656c7e7653c31f18323dfc9
parente436b88c15a894e47fcdb93ff0a4925a815db320 (diff)
dix: inputthread: Close the input thread before the event queue is deallocated
We don't want the input thread code to have problems with a nonexistent queue.
-rw-r--r--dix/main.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/dix/main.c b/dix/main.c
index 317d3ec28..91d881caa 100644
--- a/dix/main.c
+++ b/dix/main.c
@@ -315,15 +315,15 @@ int main(int argc, char *argv[], char *envp[])
CloseInput();
+#ifdef INPUT_THREAD
+ CloseInputThread();
+#endif
+
for (i = 0; i < screenInfo.numScreens; i++)
screenInfo.screens[i]->root = NullWindow;
CloseDownDevices();
CloseDownEvents();
-#ifdef INPUT_THREAD
- CloseInputThread();
-#endif
-
for (i = screenInfo.numScreens - 1; i >= 0; i--)
{
FreeScratchPixmapsForScreen(i);