Merge remote-tracking branch 'upstream/master' into refac-database

mumble-voip · Feb 15, 2025 · a4bfa50 · a4bfa50
2 parents 1e11a1c + 5b8c175
commit a4bfa50
Show file tree

Hide file tree

Showing 4 changed files with 375 additions and 345 deletions.
diff --git a/.cirrus.yml b/.cirrus.yml
@@ -3,7 +3,7 @@
 # that can be found in the LICENSE file at the root of the
 # Mumble source tree or at <https://www.mumble.info/LICENSE>.
 freebsd_instance:
-  image_family: freebsd-14-0
+  image_family: freebsd-14-2
 
 freebsd_task:
   pkg_script:

diff --git a/src/mumble/AudioInput.cpp b/src/mumble/AudioInput.cpp
@@ -1014,7 +1014,8 @@ void AudioInput::encodeAudioFrame(AudioChunk chunk) {
 
 			if (stopActiveCue) {
 				// Cancel active cue first, if there is any
-				ao->removeToken(m_activeAudioCue);
+				ao->invalidateToken(m_activeAudioCue);
+				m_activeAudioCue = {};
 			}
 
 			if (playAudioOnCue) {