summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--mi/mieq.c11
1 files changed, 2 insertions, 9 deletions
diff --git a/mi/mieq.c b/mi/mieq.c
index 43cd0e725..15ba8e723 100644
--- a/mi/mieq.c
+++ b/mi/mieq.c
@@ -248,14 +248,7 @@ mieqEnqueue(DeviceIntPtr pDev, xEvent *e)
evt->event->u.keyButtonPointer.time = miEventQueue.lastEventTime;
miEventQueue.lastEventTime = evt->event->u.keyButtonPointer.time;
-
- /* Avoid possible crash when multithreaded and mieqEnqueue is called before
- * InitAndStartDevices finishes.
- */
- if(pDev && pDev->spriteInfo && pDev->spriteInfo->sprite)
- miEventQueue.events[oldtail].pScreen = EnqueueScreen(pDev);
- else
- miEventQueue.events[oldtail].pScreen = NULL;
+ miEventQueue.events[oldtail].pScreen = EnqueueScreen(pDev);
miEventQueue.events[oldtail].pDev = pDev;
miEventQueue.lastMotion = isMotion;
@@ -408,7 +401,7 @@ mieqProcessInputEvents(void)
/* Custom event handler */
handler = miEventQueue.handlers[type];
- if (screen && screen != DequeueScreen(dev) && !handler) {
+ if (screen != DequeueScreen(dev) && !handler) {
/* Assumption - screen switching can only occur on motion events. */
DequeueScreen(dev) = screen;
x = event->u.keyButtonPointer.rootX;