From 4e829f0aca3db3a1a01999eb7910cf58b9c11058 Mon Sep 17 00:00:00 2001
From: Dianne Hackborn <>
Date: Wed, 25 Mar 2009 16:21:55 -0700
Subject: [PATCH] Automated import from //branches/master/...@142771,142771

---
 libs/ui/EventHub.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/libs/ui/EventHub.cpp b/libs/ui/EventHub.cpp
index 3b29b094db66f..7c2fc8e54b1a8 100644
--- a/libs/ui/EventHub.cpp
+++ b/libs/ui/EventHub.cpp
@@ -245,6 +245,7 @@ EventHub::device_t* EventHub::getDevice(int32_t deviceId) const
     int32_t id = deviceId & ID_MASK;
     if (id >= mNumDevicesById || id < 0) return NULL;
     device_t* dev = mDevicesById[id].device;
+    if (dev == NULL) return NULL;
     if (dev->id == deviceId) {
         return dev;
     }