Merge pull request #35 from softrabbit/stable-0.4

Make cancelling an export work immediately
LMMS · Jan 16, 2014 · 0030486 · 0030486
2 parents 7f604df + 664f109
commit 0030486
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/include/export_project_dialog.h b/include/export_project_dialog.h
@@ -69,6 +69,7 @@ private slots:
 	TrackVector m_unmutedBB;
 	ProjectRenderer::ExportFileFormats m_ft;
 	TrackVector m_tracksToRender;
+	ProjectRenderer* m_activeRenderer;
 } ;
 
 #endif
diff --git a/src/gui/export_project_dialog.cpp b/src/gui/export_project_dialog.cpp
@@ -105,6 +105,10 @@ void exportProjectDialog::reject()
 		(*it)->abortProcessing();
 	}
 
+	if( m_activeRenderer ) {
+		m_activeRenderer->abortProcessing();
+	}
+
 	QDialog::reject();
 }
 
@@ -144,6 +148,11 @@ void exportProjectDialog::closeEvent( QCloseEvent * _ce )
 			(*it)->abortProcessing();
 		}
 	}
+
+	if( m_activeRenderer && m_activeRenderer->isRunning() ) {
+		m_activeRenderer->abortProcessing();
+	}
+
 	QDialog::closeEvent( _ce );
 }
 
@@ -172,9 +181,9 @@ void exportProjectDialog::popRender()
 
 
 	// Pop next render job and start
-	ProjectRenderer* r = m_renderers.back();
+	m_activeRenderer = m_renderers.back();
 	m_renderers.pop_back();
-	render( r );
+	render( m_activeRenderer );
 }