fix notes not getting popped off sometimes...again

khang06 · Mar 19, 2020 · aa3df6f · aa3df6f
1 parent 6019f87
commit aa3df6f
Showing 1 changed file with 19 additions and 4 deletions.
diff --git a/PianoFromAbove/GameState.cpp b/PianoFromAbove/GameState.cpp
@@ -1103,10 +1103,25 @@ void MainScreen::UpdateState( int iPos )
         m_pNoteState[iNote] = -1;
 
         {
-            // binary search
-            auto pos = sse_bin_search(m_vState, iSisterIdx);
-            if (pos != -1)
-                m_vState.erase(m_vState.begin() + pos);
+            if (iSisterIdx != -1) {
+                // binary search
+                auto pos = sse_bin_search(m_vState, iSisterIdx);
+                if (pos != -1)
+                    m_vState.erase(m_vState.begin() + pos);
+            } else {
+                // slow path, should rarely happen
+                vector< int >::iterator it = m_vState.begin();
+                MIDIChannelEvent* pSearch = pEvent->GetSister();
+                while (it != m_vState.end())
+                {
+                    if (m_vEvents[*it] == pSearch) {
+                        it = m_vState.erase(it);
+                        break;
+                    } else {
+                        ++it;
+                    }
+                }
+            }
         }
 
         {