Commit ba335a79 authored by Don Gagne's avatar Don Gagne

Fix intermittent UT failure

parent b8f1fb0b
......@@ -78,7 +78,7 @@
interfaceName* className::instance(bool nullOk) \
{ \
if (!nullOk) { \
Q_ASSERT_X(_instance, "QGCSingleton", "If you hit this, then you have run into a startup or shutdown sequence bug."); \
Q_ASSERT_X(_instance, "QGCSingleton", "Request for singleton that is NULL. If you hit this, then you have likely run into a startup or shutdown sequence bug (possibly intermittent)."); \
} \
return _instance; \
} \
......
......@@ -198,17 +198,6 @@ void MAVLinkProtocol::_linkStatusChanged(LinkInterface* link, bool connected)
_stopLogging();
}
}
// Track the links which are connected to the protocol
QList<LinkInterface*> _connectedLinks; ///< List of all links connected to protocol
//qDebug() << "linkStatusChanged" << connected;
if (link) {
if (connected) {
}
}
}
/**
......@@ -294,9 +283,7 @@ void MAVLinkProtocol::receiveBytes(LinkInterface* link, QByteArray b)
// Log data
Q_ASSERT(_logSuspendError || _logSuspendReplay || _tempLogFile.isOpen());
if (!_logSuspendError && !_logSuspendReplay) {
if (!_logSuspendError && !_logSuspendReplay && _tempLogFile.isOpen()) {
uint8_t buf[MAVLINK_MAX_PACKET_LEN+sizeof(quint64)];
// Write the uint64 time in microseconds in big endian format before the message.
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment