hertog/godot-module-template
Template
2
1
Fork 1
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #116676 from TokageItLab/safe-finished

Browse source 
Check `playback_queue` existance after emit `animation_finished` signal
This commit is contained in:
Thaddeus Crews 2026-02-24 09:29:38 -06:00
commit 6e96b028e1
No known key found for this signature in database
GPG key ID: 8C6E5FEB5FC03CCC
1 changed files with 8 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

9
scene/animation/animation_player.cpp
View file

@ -336,9 +336,16 @@ void AnimationPlayer::_blend_post_process() {
if (end_reached) {
// If the method track changes current animation, the animation is not finished.
if (tmp_from == animation_set[playback.current.animation_name].animation->get_instance_id()) {
if (playback_queue.size()) {
if (!playback_queue.is_empty()) {
if (!finished_anim.is_empty()) {
emit_signal(SceneStringName(animation_finished), finished_anim);
// Abort if playback_queue is cleared by animation_finished signal.
if (playback_queue.is_empty()) {
end_reached = false;
end_notify = false;
tmp_from = ObjectID();
return;
}
}
String old = playback.assigned;
play(playback_queue.front()->get());