diff --git a/ChangeLog b/ChangeLog
index b8a8be79e..d7624aef1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2008-05-13	Tobias Doerffel	<tobydox/at/users/dot/sourceforge/dot/net>
 
+	* src/gui/widgets/visualization_widget.cpp:
+	do not update while song-export
+
 	* src/gui/dialogs/export_project.ui:
 	improved usability
 
diff --git a/src/gui/widgets/visualization_widget.cpp b/src/gui/widgets/visualization_widget.cpp
index cc7034120..e31d426bb 100644
--- a/src/gui/widgets/visualization_widget.cpp
+++ b/src/gui/widgets/visualization_widget.cpp
@@ -35,6 +35,7 @@
 #include "engine.h"
 #include "templates.h"
 #include "tooltip.h"
+#include "song.h"
 #include "song_editor.h"
 
 
@@ -74,16 +75,19 @@ visualizationWidget::~visualizationWidget()
 
 void visualizationWidget::updateAudioBuffer( void )
 {
-	engine::getMixer()->lock();
-	const surroundSampleFrame * c = engine::getMixer()->
-						currentReadBuffer();
-	for( f_cnt_t f = 0; f < engine::getMixer()->framesPerPeriod();
-								++f )
+	if( !engine::getSong()->isExporting() )
 	{
-		m_buffer[f][0] = c[f][0];
-		m_buffer[f][1] = c[f][1];
+		engine::getMixer()->lock();
+		const surroundSampleFrame * c = engine::getMixer()->
+							currentReadBuffer();
+		for( f_cnt_t f = 0; f < engine::getMixer()->framesPerPeriod();
+									++f )
+		{
+			m_buffer[f][0] = c[f][0];
+			m_buffer[f][1] = c[f][1];
+		}
+		engine::getMixer()->unlock();
 	}
-	engine::getMixer()->unlock();
 }
 
 
@@ -124,7 +128,7 @@ void visualizationWidget::paintEvent( QPaintEvent * )
 
 	p.drawPixmap( 0, 0, s_background );
 
-	if( m_active )
+	if( m_active && !engine::getSong()->isExporting() )
 	{
 		float master_output = engine::getMixer()->masterGain();
 		int w = width()-4;