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

Destroy PlayerInfo after EngineRecord is stopped to fix a debug assertion #12341

Merged
merged 1 commit into from
Nov 23, 2023
Merged

Destroy PlayerInfo after EngineRecord is stopped to fix a debug assertion #12341

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
12 changes: 7 additions & 5 deletions src/coreservices.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -569,11 +569,6 @@ void CoreServices::finalize() {
qDebug() << t.elapsed(false).debugMillisWithUnit() << "deleting PlayerManager";
CLEAR_AND_CHECK_DELETED(m_pPlayerManager);

// Destroy PlayerInfo explicitly to release the track
// pointers of tracks that were still loaded in decks
// or samplers when PlayerManager was destroyed!
PlayerInfo::destroy();

// Delete the library after the view so there are no dangling pointers to
// the data models.
// Depends on RecordingManager and PlayerManager
Expand All @@ -594,6 +589,13 @@ void CoreServices::finalize() {
qDebug() << t.elapsed(false).debugMillisWithUnit() << "deleting EngineMixer";
CLEAR_AND_CHECK_DELETED(m_pEngine);

// Destroy PlayerInfo explicitly to release the track
// pointers of tracks that were still loaded in decks
// or samplers when PlayerManager was destroyed!
// Do this after deleting EngineMixer which makes use of
// PlayerInfo in EngineRecord.
PlayerInfo::destroy();

qDebug() << t.elapsed(false).debugMillisWithUnit() << "deleting EffectsManager";
CLEAR_AND_CHECK_DELETED(m_pEffectsManager);

Expand Down
Loading