From 0295bdb773c5f6c26ac7cc62732655bfd82835af Mon Sep 17 00:00:00 2001 From: Paul Ferrand Date: Fri, 7 Aug 2020 11:19:41 +0200 Subject: [PATCH] Correct the ordering --- src/sfizz/Voice.h | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/sfizz/Voice.h b/src/sfizz/Voice.h index b00b2a18..f567c5e6 100644 --- a/src/sfizz/Voice.h +++ b/src/sfizz/Voice.h @@ -511,17 +511,17 @@ inline bool sisterVoices(const Voice* lhs, const Voice* rhs) inline bool voiceOrdering(const Voice* lhs, const Voice* rhs) { - if (lhs->getAge() > rhs->getAge()) - return true; + if (lhs->getAge() != rhs->getAge()) + return lhs->getAge() > rhs->getAge(); - if (lhs->getTriggerNumber() < rhs->getTriggerNumber()) - return true; + if (lhs->getTriggerNumber() != rhs->getTriggerNumber()) + return lhs->getTriggerNumber() < rhs->getTriggerNumber(); - if (lhs->getTriggerValue() < rhs->getTriggerValue()) - return true; + if (lhs->getTriggerValue() != rhs->getTriggerValue()) + return lhs->getTriggerValue() < rhs->getTriggerValue(); - if (lhs->getTriggerType() > rhs->getTriggerType()) - return true; + if (lhs->getTriggerType() != rhs->getTriggerType()) + return lhs->getTriggerType() > rhs->getTriggerType(); return false; }