Skip to content

Clean up after render in ProjectRenderer destructor #3680

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

Merged
zonkmachine merged 1 commit into from
Jul 7, 2017
+3 −5
Merged

Clean up after render in ProjectRenderer destructor #3680

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
8 changes: 3 additions & 5 deletions src/core/ProjectRenderer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,8 @@ ProjectRenderer::ProjectRenderer( const Mixer::qualitySettings & qualitySettings

ProjectRenderer::~ProjectRenderer()
{
Engine::mixer()->restoreAudioDevice(); // also deletes audio-dev
Engine::mixer()->changeQuality( m_oldQualitySettings );
}


Expand Down Expand Up @@ -201,12 +203,8 @@ void ProjectRenderer::run()

Engine::getSong()->stopExport();

const QString f = m_fileDev->outputFile();

Engine::mixer()->restoreAudioDevice(); // also deletes audio-dev
Engine::mixer()->changeQuality( m_oldQualitySettings );

// if the user aborted export-process, the file has to be deleted
const QString f = m_fileDev->outputFile();
if( m_abort )
{
QFile( f ).remove();
Expand Down