From 7ceacd27517dd3856584d5a20ad73be1a43a8900 Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Fri, 7 Feb 2014 10:24:01 -0800
Subject: [PATCH] remove blank if and fix ping reply construction

---
 libraries/audio/src/AudioInjector.cpp | 4 ----
 libraries/shared/src/NodeList.cpp     | 5 ++++-
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/libraries/audio/src/AudioInjector.cpp b/libraries/audio/src/AudioInjector.cpp
index 905c1ecfc6..ff243459b7 100644
--- a/libraries/audio/src/AudioInjector.cpp
+++ b/libraries/audio/src/AudioInjector.cpp
@@ -96,10 +96,6 @@ void AudioInjector::injectAudio() {
             // send off this audio packet
             nodeList->writeDatagram(injectAudioPacket, audioMixer);
             
-            if (audioMixer && nodeList->getNodeActiveSocketOrPing(audioMixer)) {
-                
-            }
-            
             currentSendPosition += bytesToCopy;
             
             // send two packets before the first sleep so the mixer can start playback right away
diff --git a/libraries/shared/src/NodeList.cpp b/libraries/shared/src/NodeList.cpp
index ed3e37dae6..c30c6de56a 100644
--- a/libraries/shared/src/NodeList.cpp
+++ b/libraries/shared/src/NodeList.cpp
@@ -605,13 +605,16 @@ QByteArray NodeList::constructPingReplyPacket(const QByteArray& pingPacket) {
     QDataStream pingPacketStream(pingPacket);
     pingPacketStream.skipRawData(numBytesForPacketHeader(pingPacket));
     
+    PingType_t typeFromOriginalPing;
+    pingPacketStream >> typeFromOriginalPing;
+    
     quint64 timeFromOriginalPing;
     pingPacketStream >> timeFromOriginalPing;
     
     QByteArray replyPacket = byteArrayWithPopluatedHeader(PacketTypePingReply);
     QDataStream packetStream(&replyPacket, QIODevice::Append);
     
-    packetStream << timeFromOriginalPing << usecTimestampNow();
+    packetStream << typeFromOriginalPing << timeFromOriginalPing << usecTimestampNow();
     
     return replyPacket;
 }