From 10eb8985f4416315488975a983ccf11f3edf9959 Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Fri, 20 Dec 2013 15:29:12 -0800
Subject: [PATCH 1/2] remove the double catch sound

---
 interface/src/avatar/Hand.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/interface/src/avatar/Hand.cpp b/interface/src/avatar/Hand.cpp
index 136d59bc37..baf66cd3ca 100644
--- a/interface/src/avatar/Hand.cpp
+++ b/interface/src/avatar/Hand.cpp
@@ -125,12 +125,12 @@ void Hand::simulateToyBall(PalmData& palm, const glm::vec3& fingerTipPosition, f
             //printf(">>>>>>> caught... handID:%d particle ID:%d _toyBallInHand[handID] = true\n", handID, closestParticle->getID());
             _ballParticleEditHandles[handID] = caughtParticle;
             caughtParticle = NULL;
-            //  Play a catch sound!
+            
+            // set the position of the catch sound to the new position of the ball
             _catchInjector.setPosition(targetPosition);
             
             // inject the catch sound to the mixer and play it locally
             _catchInjector.injectViaThread(app->getAudio());
-            app->getAudio()->startDrumSound(1.0, 300, 0.75, 0.015);
         }
     }
     

From 591876eaf3e11709664eec11467831869806225c Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Thu, 2 Jan 2014 10:01:47 -0800
Subject: [PATCH 2/2] notify for node kill on NodeList clear

---
 libraries/shared/src/NodeList.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/libraries/shared/src/NodeList.cpp b/libraries/shared/src/NodeList.cpp
index cded2f7d4e..c763a52e05 100644
--- a/libraries/shared/src/NodeList.cpp
+++ b/libraries/shared/src/NodeList.cpp
@@ -294,9 +294,9 @@ void NodeList::clear() {
         Node* node = nodeBucket[i % NODES_PER_BUCKET];
         
         node->lock();
-        delete node;
+        notifyHooksOfKilledNode(&*node);
         
-        node = NULL;
+        delete node;
     }
     
     _numNodes = 0;