Skip to content

Commit

Permalink
Clean up after render in ProjectRenderer destructor
Browse files Browse the repository at this point in the history
We need to wait with calling Mixer::restoreAudioDevice() and
Mixer::changeQuality() after render until all threads have stopped.
Moving these calls to ProjectRenderer::~ProjectRenderer() ensures
all render theads are done.
  • Loading branch information
zonkmachine committed Jul 6, 2017
1 parent d65e1a3 commit 2ef4e7b
Showing 1 changed file with 3 additions and 5 deletions.
8 changes: 3 additions & 5 deletions src/core/ProjectRenderer.cpp
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

0 comments on commit 2ef4e7b

Please sign in to comment.