From 3730be980413c9813f5fd6b7f84da577f8bce668 Mon Sep 17 00:00:00 2001
From: wangyix <wangyix@gmail.com>
Date: Tue, 1 Jul 2014 14:03:26 -0700
Subject: [PATCH] nacked edit packets are not resent if NACKs are disabled in
 menu

---
 interface/src/DatagramProcessor.cpp | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/interface/src/DatagramProcessor.cpp b/interface/src/DatagramProcessor.cpp
index a159af7be5..6c39994bf3 100644
--- a/interface/src/DatagramProcessor.cpp
+++ b/interface/src/DatagramProcessor.cpp
@@ -149,13 +149,19 @@ void DatagramProcessor::processDatagrams() {
                     break;
                 }
                 case PacketTypeVoxelEditNack:
-                    application->_voxelEditSender.processNackPacket(incomingPacket);
+                    if (!Menu::getInstance()->isOptionChecked(MenuOption::DisableNackPackets)) {
+                        application->_voxelEditSender.processNackPacket(incomingPacket);
+                    }
                     break;
                 case PacketTypeParticleEditNack:
-                    application->_particleEditSender.processNackPacket(incomingPacket);
+                    if (!Menu::getInstance()->isOptionChecked(MenuOption::DisableNackPackets)) {
+                        application->_particleEditSender.processNackPacket(incomingPacket);
+                    }
                     break;
                 case PacketTypeModelEditNack:
-                    application->_modelEditSender.processNackPacket(incomingPacket);
+                    if (!Menu::getInstance()->isOptionChecked(MenuOption::DisableNackPackets)) {
+                        application->_modelEditSender.processNackPacket(incomingPacket);
+                    }
                     break;
                 default:
                     nodeList->processNodeData(senderSockAddr, incomingPacket);