diff --git a/ChangeLog b/ChangeLog
index 4c2fb9496..e19e50e42 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-08-28	Csaba Hruska <csaba.hruska/at/gmail.com>
+	* include/audio_portaudio.h:
+	* src/core/audio/audio_portaudio.cpp:
+	fixed segfault in PortAudio's setup widget
+	fixed hangon on PortAudio exit
+
 2008-08-27	Csaba Hruska <csaba.hruska/at/gmail.com>
 
 	* include/audio_portaudio.h:
diff --git a/include/audio_portaudio.h b/include/audio_portaudio.h
index 773bc3b1f..afc064a30 100644
--- a/include/audio_portaudio.h
+++ b/include/audio_portaudio.h
@@ -109,6 +109,8 @@ private:
 
 #else
 
+#define paContinue 0
+#define paComplete 1
 #define Pa_GetDeviceCount Pa_CountDevices
 #define Pa_GetDefaultInputDevice Pa_GetDefaultInputDeviceID
 #define Pa_GetDefaultOutputDevice Pa_GetDefaultOutputDeviceID
diff --git a/src/core/audio/audio_portaudio.cpp b/src/core/audio/audio_portaudio.cpp
index 4a992f07a..82e5b5ef8 100644
--- a/src/core/audio/audio_portaudio.cpp
+++ b/src/core/audio/audio_portaudio.cpp
@@ -208,15 +208,14 @@ audioPortAudio::~audioPortAudio()
 
 void audioPortAudio::startProcessing( void )
 {
+	m_stopped = FALSE;
 	PaError err = Pa_StartStream( m_paStream );
 	
 	if( err != paNoError )
 	{
+		m_stopped = TRUE;
 		printf( "PortAudio error: %s\n", Pa_GetErrorText( err ) );
-		return;
 	}
-
-	m_stopped = FALSE;
 }
 
 
@@ -224,12 +223,11 @@ void audioPortAudio::startProcessing( void )
 
 void audioPortAudio::stopProcessing( void )
 {
-
 	if( Pa_IsStreamActive( m_paStream ) )
 	{
 		m_stop_semaphore.acquire();
 		
-		PaError err = Pa_CloseStream( m_paStream );
+		PaError err = Pa_StopStream( m_paStream );
 	
 		if( err != paNoError )
 		{
@@ -299,7 +297,7 @@ int audioPortAudio::process_callback(
 	{
 		memset( _outputBuffer, 0, _framesPerBuffer *
 			channels() * sizeof(float) );
-		return 0;
+		return paComplete;
 	}
 
 	while( _framesPerBuffer )
@@ -310,11 +308,12 @@ int audioPortAudio::process_callback(
 			const fpp_t frames = getNextBuffer( m_outBuf );
 			if( !frames )
 			{
+				printf( "callback stopped and mutex released'\n" );
 				m_stopped = TRUE;
 				m_stop_semaphore.release();
 				memset( _outputBuffer, 0, _framesPerBuffer *
 					channels() * sizeof(float) );
-				return 0;
+				return paComplete;
 			}
 			m_outBuf_size = frames;
 		}
@@ -339,6 +338,7 @@ int audioPortAudio::process_callback(
 		m_outBuf_pos %= m_outBuf_size;
 	}
 
+	return paContinue;
 }
 
 
@@ -361,10 +361,8 @@ int audioPortAudio::_process_callback( void *_inputBuffer, void *_outputBuffer,
 #endif
 	
 	audioPortAudio * _this  = static_cast<audioPortAudio *> (_arg);
-	_this->process_callback( (const float*)_inputBuffer,
+	return _this->process_callback( (const float*)_inputBuffer,
 		(float*)_outputBuffer, _framesPerBuffer );
-	
-	return 0;
 }
 
 
@@ -474,6 +472,8 @@ audioPortAudio::setupWidget::setupWidget( QWidget * _parent ) :
 		hi = Pa_GetHostApiInfo( i );
 		m_setupUtil.m_backendModel.addItem( hi->name );
 	}
+#else
+	m_setupUtil.m_backendModel.addItem( "" );
 #endif
 	Pa_Terminate();