From 87eee68d0a24d3b2c454a0f17983f2136ef2714f Mon Sep 17 00:00:00 2001 From: Brad Howes Date: Thu, 18 Jun 2020 12:48:42 +0200 Subject: [PATCH 1/3] Missing iterator increment Increment iterator in the cases where the current node is not removed from the list. --- src/cinder/audio/Param.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/cinder/audio/Param.cpp b/src/cinder/audio/Param.cpp index 5cd357f7d2..d96bb16d14 100644 --- a/src/cinder/audio/Param.cpp +++ b/src/cinder/audio/Param.cpp @@ -352,6 +352,7 @@ void Param::removeEventsAt( double time ) if( event.getTimeBegin() >= time ) { if( contextDisabled ) { eventIt = mEvents.erase( eventIt ); + continue; } else { event.cancel(); @@ -365,6 +366,7 @@ void Param::removeEventsAt( double time ) else event.mTimeCancel = time; } + ++eventIt; } } From 1a4153f68ca15d1645487234cd54cea595671288 Mon Sep 17 00:00:00 2001 From: Brad Howes Date: Thu, 18 Jun 2020 18:22:09 +0200 Subject: [PATCH 2/3] Correct indentation --- src/cinder/audio/Param.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/cinder/audio/Param.cpp b/src/cinder/audio/Param.cpp index d96bb16d14..0d1e4b1b7e 100644 --- a/src/cinder/audio/Param.cpp +++ b/src/cinder/audio/Param.cpp @@ -352,7 +352,7 @@ void Param::removeEventsAt( double time ) if( event.getTimeBegin() >= time ) { if( contextDisabled ) { eventIt = mEvents.erase( eventIt ); - continue; + continue; } else { event.cancel(); From de9710c34c9abcd3bea11301560983aafa9850d2 Mon Sep 17 00:00:00 2001 From: Brad Howes Date: Thu, 18 Jun 2020 18:23:11 +0200 Subject: [PATCH 3/3] Fixed indentation for real --- src/cinder/audio/Param.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/cinder/audio/Param.cpp b/src/cinder/audio/Param.cpp index 0d1e4b1b7e..9067e46981 100644 --- a/src/cinder/audio/Param.cpp +++ b/src/cinder/audio/Param.cpp @@ -352,7 +352,7 @@ void Param::removeEventsAt( double time ) if( event.getTimeBegin() >= time ) { if( contextDisabled ) { eventIt = mEvents.erase( eventIt ); - continue; + continue; } else { event.cancel();