diff --git a/ChangeLog b/ChangeLog
index f21da4e60..a45aa1dbc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2006-08-10	Danny McRae <khjklujn/at/users/dot/sourceforge/dot/net>
+	* src/core/mixer:
+	got rid of the "more_effect |= ..." nonsense
+	
+	* src/widgets/effect_label.cpp:
+	* src/widgets/rack_plugin.cpp:
+	changed the parenting of the control dialog to main window
+	instead of NULL
+
 2006-08-11	Tobias Doerffel	<tobydox/at/users/dot/sourceforge/dot/net>
 
 	* configure.in:
diff --git a/src/core/mixer.cpp b/src/core/mixer.cpp
index d0269b837..6dc15a4f9 100644
--- a/src/core/mixer.cpp
+++ b/src/core/mixer.cpp
@@ -285,7 +285,7 @@ const surroundSampleFrame * mixer::renderNextBuffer( void )
 						it != m_audioPorts.end(); ++it )
 		{
 #ifdef LADSPA_SUPPORT
-			more_effects |= ( *it )->processEffects();
+			more_effects = ( *it )->processEffects();
 			if( ( *it )->m_bufferUsage != audioPort::NONE || more_effects )
 #else
 			if( ( *it )->m_bufferUsage != audioPort::NONE )
diff --git a/src/widgets/effect_label.cpp b/src/widgets/effect_label.cpp
index 6a3d2488b..f7dbbdd38 100644
--- a/src/widgets/effect_label.cpp
+++ b/src/widgets/effect_label.cpp
@@ -33,6 +33,7 @@
 #include "embed.h"
 #include "gui_templates.h"
 #include "rename_dialog.h"
+#include "main_window.h"
 
 
 effectLabel::effectLabel( const QString & _initial_name, QWidget * _parent, engine * _engine, sampleTrack * _track ) :
@@ -51,7 +52,7 @@ effectLabel::effectLabel( const QString & _initial_name, QWidget * _parent, engi
 	m_label->setFont( pointSize<8>( f ) );
 	m_label->setGeometry( 38, 1, 200, 28 );
 	
-	m_effWidget = new effectTabWidget( NULL, m_track, m_track->getAudioPort() );
+	m_effWidget = new effectTabWidget( eng()->getMainWindow()->workspace(), m_track, m_track->getAudioPort() );
 	m_effWidget->setFixedSize( 240, 242 );
 	m_effWidget->hide();
 	connect( m_effWidget, SIGNAL( closed() ), this, SLOT( closeEffects() ) );
diff --git a/src/widgets/rack_plugin.cpp b/src/widgets/rack_plugin.cpp
index 91d83e141..0171812fc 100644
--- a/src/widgets/rack_plugin.cpp
+++ b/src/widgets/rack_plugin.cpp
@@ -60,6 +60,7 @@
 #include "ladspa_control_dialog.h"
 #include "embed.h"
 #include "gui_templates.h"
+#include "main_window.h"
 
 
 rackPlugin::rackPlugin( QWidget * _parent, ladspa_key_t _key, track * _track, engine * _engine, audioPort * _port ) :
@@ -157,7 +158,7 @@ rackPlugin::rackPlugin( QWidget * _parent, ladspa_key_t _key, track * _track, en
 	m_label->setFont( pointSize<7>( f ) );
 	m_label->setGeometry( 5, 38, 200, 20 );
 	
-	m_controlView = new ladspaControlDialog( NULL, m_effect, eng(), m_track );
+	m_controlView = new ladspaControlDialog( eng()->getMainWindow()->workspace(), m_effect, eng(), m_track );
 	connect( m_controlView, SIGNAL( closed() ), this, SLOT( closeEffects() ) );
 	m_controlView->hide();