From 80590047552e50ffab4c12e00a1898c4867490da Mon Sep 17 00:00:00 2001
From: James Cotton <peabody124@gmail.com>
Date: Sun, 11 Mar 2012 21:16:17 -0500
Subject: [PATCH] Make sure if an event has a null handle and the queue is full
 we don't try and query UAVObjID

---
 flight/UAVObjects/eventdispatcher.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/flight/UAVObjects/eventdispatcher.c b/flight/UAVObjects/eventdispatcher.c
index 61a31c258..c55726669 100644
--- a/flight/UAVObjects/eventdispatcher.c
+++ b/flight/UAVObjects/eventdispatcher.c
@@ -350,7 +350,8 @@ static int32_t processPeriodicUpdates()
     			{
     				if ( xQueueSend(objEntry->evInfo.queue, &objEntry->evInfo.ev, 0) != pdTRUE ) // do not block if queue is full
     				{
-						stats.lastErrorID = UAVObjGetID(objEntry->evInfo.ev.obj);
+						if (objEntry->evInfo.ev.obj != NULL)
+							stats.lastErrorID = UAVObjGetID(objEntry->evInfo.ev.obj);
     					++stats.eventErrors;
     				}
     			}