diff --git a/ChangeLog b/ChangeLog
index dcfc582b2..406c87cfa 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,18 @@
+2008-09-24	Tobias Doerffel	<tobydox/at/users/dot/sourceforge/dot/net>
+
+	* src/core/sample_buffer.cpp:
+	* src/core/sample_record_handle.cpp:
+	* src/tracks/sample_track.cpp:
+	* plugins/bit_invader/bit_invader.cpp:
+	fixed compiler warnings
+
+	* src/gui/controller_connection_dialog.cpp:
+	do not crash when opening controller connection dialog and using a
+	non-sequenced (raw) MIDI-client
+
+	* data/presets/TripleOscillator/SawLead.xpf:
+	fixed preset name
+
 2008-09-23	Tobias Doerffel	<tobydox/at/users/dot/sourceforge/dot/net>
 
 	* CMakeLists.txt:
diff --git a/src/gui/controller_connection_dialog.cpp b/src/gui/controller_connection_dialog.cpp
index 53d212b30..7912d948e 100644
--- a/src/gui/controller_connection_dialog.cpp
+++ b/src/gui/controller_connection_dialog.cpp
@@ -361,7 +361,10 @@ void controllerConnectionDialog::midiToggled( void )
 					&m_midiController->m_midiPort.m_inputChannelModel );
 			m_midiControllerSpinBox->setModel( 
 					&m_midiController->m_midiPort.m_inputControllerModel );
-			m_readablePorts->setModel( &m_midiController->m_midiPort );
+			if( m_readablePorts )
+			{
+				m_readablePorts->setModel( &m_midiController->m_midiPort );
+			}
 
 
 			connect( m_midiController, SIGNAL( valueChanged() ),