Merge branch 'atp' of https://github.com/birarda/hifi into protocol

This commit is contained in:
Atlante45 2015-07-09 11:37:17 -07:00
commit 4d72e3d309

View file

@ -368,7 +368,7 @@ bool OctreeQueryNode::hasNextNackedPacket() const {
const NLPacket* OctreeQueryNode::getNextNackedPacket() {
if (!_nackedSequenceNumbers.isEmpty()) {
// could return null if packet is not in the history
return _sentPacketHistory.getPacket(_nackedSequenceNumbers.dequeue()).get();
return _sentPacketHistory.getPacket(_nackedSequenceNumbers.dequeue());
}
return nullptr;