Merge branch 'master' into hopkins

1 files changed, 12 insertions, 0 deletions

diff --git a/audio/softsynth/mt32/Poly.cpp b/audio/softsynth/mt32/Poly.cpp
index a2f00db73c..46e30c0f02 100644
--- a/audio/softsynth/mt32/Poly.cpp
+++ b/audio/softsynth/mt32/Poly.cpp
@@ -29,6 +29,7 @@ Poly::Poly(Part *usePart) {
 		partials[i] = NULL;
 	}
 	state = POLY_Inactive;
+	next = NULL;
 }
 
 void Poly::reset(unsigned int newKey, unsigned int newVelocity, bool newSustain, Partial **newPartials) {
@@ -58,6 +59,9 @@ bool Poly::noteOff(bool pedalHeld) {
 		return false;
 	}
 	if (pedalHeld) {
+		if (state == POLY_Held) {
+			return false;
+		}
 		state = POLY_Held;
 	} else {
 		startDecay();
@@ -171,4 +175,12 @@ void Poly::partialDeactivated(Partial *partial) {
 	part->partialDeactivated(this);
 }
 
+Poly *Poly::getNext() {
+	return next;
+}
+
+void Poly::setNext(Poly *poly) {
+	next = poly;
+}
+
 }