Fix waitForFinishedWithEventLoop() causing a freeze in composer

Thanks Nyall for finding that out!
qgis · Jun 16, 2014 · bff7882 · bff7882
1 parent 033bf6f
commit bff7882
Showing 1 changed file with 3 additions and 11 deletions.
diff --git a/src/core/qgsmaprendererjob.cpp b/src/core/qgsmaprendererjob.cpp
@@ -238,18 +238,10 @@ void QgsMapRendererCustomPainterJob::start()
   QgsDebugMsg( "Rendering prepared in (seconds): " + QString( "%1" ).arg( prepareTime.elapsed() / 1000.0 ) );
 
   // now we are ready to start rendering!
-  if ( !mLayerJobs.isEmpty() )
-  {
-    connect( &mFutureWatcher, SIGNAL( finished() ), SLOT( futureFinished() ) );
+  connect( &mFutureWatcher, SIGNAL( finished() ), SLOT( futureFinished() ) );
 
-    mFuture = QtConcurrent::run( staticRender, this );
-    mFutureWatcher.setFuture( mFuture );
-  }
-  else
-  {
-    // just make sure we will clean up and emit finished() signal
-    QTimer::singleShot( 0, this, SLOT( futureFinished() ) );
-  }
+  mFuture = QtConcurrent::run( staticRender, this );
+  mFutureWatcher.setFuture( mFuture );
 }