Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

don't emit Dialogic.timeline_ended until Timeline#clean has been called #2146

Merged
merged 1 commit into from
Mar 27, 2024
Merged

don't emit Dialogic.timeline_ended until Timeline#clean has been called #2146

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions addons/dialogic/Core/DialogicGameHandler.gd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -240,7 +240,7 @@ func preload_timeline(timeline_resource:Variant) -> Variant:

## Clears and stops the current timeline.
func end_timeline() -> void:
clear(ClearFlags.TIMELINE_INFO_ONLY)
await clear(ClearFlags.TIMELINE_INFO_ONLY)
_on_timeline_ended()
timeline_ended.emit()

Expand Down Expand Up @@ -295,7 +295,7 @@ func clear(clear_flags := ClearFlags.FULL_CLEAR) -> bool:

# Resetting variables
if current_timeline:
current_timeline.clean()
await current_timeline.clean()

current_timeline = null
current_event_idx = -1
Expand Down
Loading