Skip to content

Commit

Permalink
Cleanup rendering jobs in the main thread (fixes a crash in sequentia…
Browse files Browse the repository at this point in the history
…l job)
  • Loading branch information
wonder-sk committed Jan 6, 2014
1 parent 1074312 commit cae352b
Showing 1 changed file with 4 additions and 3 deletions.
7 changes: 4 additions & 3 deletions src/core/qgsmaprendererjob.cpp
Expand Up @@ -301,6 +301,10 @@ void QgsMapRendererCustomPainterJob::futureFinished()
mActive = false;
mRenderingTime = mRenderingStart.elapsed();
qDebug("QPAINTER futureFinished");

// final cleanup
cleanupJobs( mLayerJobs );

emit finished();
}

Expand Down Expand Up @@ -341,9 +345,6 @@ void QgsMapRendererCustomPainterJob::doRender()

}

// final cleanup
cleanupJobs( mLayerJobs );

QgsDebugMsg( "Done rendering map layers" );

if ( mSettings.testFlag( QgsMapSettings::DrawLabeling ) && !mLabelingRenderContext.renderingStopped() )
Expand Down

0 comments on commit cae352b

Please sign in to comment.