From 64018c88c171f216d543097db9799d2822996c92 Mon Sep 17 00:00:00 2001 From: peabody124 Date: Thu, 16 Sep 2010 06:20:49 +0000 Subject: [PATCH] OP-144 Ground: Removing assert on getObject when it returns null because this seems to happen whenever uavtalk gets a bad message. git-svn-id: svn://svn.openpilot.org/OpenPilot/trunk@1658 ebee16cc-31ac-478f-84a7-5cbb03baadba --- ground/src/plugins/uavobjects/uavobjectmanager.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ground/src/plugins/uavobjects/uavobjectmanager.cpp b/ground/src/plugins/uavobjects/uavobjectmanager.cpp index 5ef3436d3..c4f6f656e 100644 --- a/ground/src/plugins/uavobjects/uavobjectmanager.cpp +++ b/ground/src/plugins/uavobjects/uavobjectmanager.cpp @@ -259,7 +259,7 @@ UAVObject* UAVObjectManager::getObject(const QString* name, quint32 objId, quint } } } - Q_ASSERT_X(0,"UAVObjectManager::getObject",(QString("Non existant object ") + *name + QString("requested. This indicates a bug. Make sure you also have null checking for non-debug code.")).toAscii()); + //qWarning("UAVObjectManager::getObject: Object not found. Probably a bug or mismatched GCS/flight versions."); // If this point is reached then the requested object could not be found return NULL; }