resolve conflicts on merge with birarda/protocol

This commit is contained in:
Stephen Birarda 2015-07-24 15:57:20 -07:00
commit 9c792f00df

View file

@ -226,7 +226,7 @@ void PacketReceiver::handleVerifiedPacket(std::unique_ptr<udt::Packet> packet) {
auto it = _packetListenerMap.find(nlPacket->getType());
if (it != _packetListenerMap.end()) {
if (it != _packetListenerMap.end() && it->second.isValid()) {
auto listener = it.value();