From da9163616a3225f272c573e0a997ac38bc83e024 Mon Sep 17 00:00:00 2001 From: luiscuenca Date: Fri, 23 Aug 2019 08:46:59 -0700 Subject: [PATCH 1/2] Don't allow reactions ref count got bellow 0 --- interface/src/avatar/MyAvatar.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/interface/src/avatar/MyAvatar.cpp b/interface/src/avatar/MyAvatar.cpp index af49aa1e3c..a599ec926b 100644 --- a/interface/src/avatar/MyAvatar.cpp +++ b/interface/src/avatar/MyAvatar.cpp @@ -5863,7 +5863,11 @@ bool MyAvatar::endReaction(QString reactionName) { int reactionIndex = beginEndReactionNameToIndex(reactionName); if (reactionIndex >= 0 && reactionIndex < (int)NUM_AVATAR_BEGIN_END_REACTIONS) { std::lock_guard guard(_reactionLock); - _reactionEnabledRefCounts[reactionIndex]--; + if (_reactionEnabledRefCounts[reactionIndex] > 0) { + _reactionEnabledRefCounts[reactionIndex]--; + } else { + _reactionEnabledRefCounts[reactionIndex] = 0; + } return true; } return false; From 19d85ba824232950dd3f0c34cd5e5c60a63ed91a Mon Sep 17 00:00:00 2001 From: luiscuenca Date: Fri, 23 Aug 2019 09:07:27 -0700 Subject: [PATCH 2/2] MyAvatar.endReaction return false when no reaction has been trigger previously --- interface/src/avatar/MyAvatar.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/interface/src/avatar/MyAvatar.cpp b/interface/src/avatar/MyAvatar.cpp index a599ec926b..089ff4c2bf 100644 --- a/interface/src/avatar/MyAvatar.cpp +++ b/interface/src/avatar/MyAvatar.cpp @@ -5865,10 +5865,11 @@ bool MyAvatar::endReaction(QString reactionName) { std::lock_guard guard(_reactionLock); if (_reactionEnabledRefCounts[reactionIndex] > 0) { _reactionEnabledRefCounts[reactionIndex]--; + return true; } else { _reactionEnabledRefCounts[reactionIndex] = 0; + return false; } - return true; } return false; }