diff --git a/ChangeLog b/ChangeLog
index a76d28900..7767f7c82 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2006-07-20	Tobias Doerffel	<tobydox/at/users/dot/sourceforge/dot/net>
+
+	* src/tracks/automation_pattern.cpp:
+	automationPattern::processMidiTime(): do not start search on time-map if
+	empty - find() on maps is horribly slow and makes LMMS unusable (still
+	have to find a better solution without any find()s at all)
+
 2006-07-19	Tobias Doerffel	<tobydox/at/users/dot/sourceforge/dot/net>
 
 	* configure.in:
diff --git a/configure.in b/configure.in
index d412faa92..2aaf53553 100644
--- a/configure.in
+++ b/configure.in
@@ -2,8 +2,8 @@
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ(2.50)
-AC_INIT(lmms, 0.2.0, tobydox/at/users/dot/sourceforge/dot/net)
-AM_INIT_AUTOMAKE(lmms, 0.2.0)
+AC_INIT(lmms, 0.2.0-cvs20060720, tobydox/at/users/dot/sourceforge/dot/net)
+AM_INIT_AUTOMAKE(lmms, 0.2.0-cvs20060720)
 
 AM_CONFIG_HEADER(config.h)
 
@@ -16,9 +16,10 @@ AC_PROG_LIBTOOL
 
 EXTRAFLAGS="-floop-optimize2 -fomit-frame-pointer -fgcse-sm -fgcse-las"
 
-if test "x`$CC --version|head -1|cut -d\  -f3|cut -d. -f1`" = "x4" ; then
-	EXTRAFLAGS="$EXTRAFLAGS -ftree-vectorize -funsafe-loop-optimizations -Wunsafe-loop-optimizations -ftree-loop-linear"
-fi
+#somehow enable this later
+#if test "x`$CC --version|head -1|cut -d\  -f3|cut -d. -f1`" = "x4" ; then
+	#EXTRAFLAGS="$EXTRAFLAGS -ftree-vectorize -funsafe-loop-optimizations -Wunsafe-loop-optimizations -ftree-loop-linear"
+#fi
 CFLAGS="$CFLAGS $EXTRAFLAGS"
 CXXFLAGS="$CXXFLAGS $EXTRAFLAGS"
 
diff --git a/src/tracks/automation_pattern.cpp b/src/tracks/automation_pattern.cpp
index 7a339efff..70333ba08 100644
--- a/src/tracks/automation_pattern.cpp
+++ b/src/tracks/automation_pattern.cpp
@@ -254,10 +254,13 @@ const QString automationPattern::name( void )
 
 void automationPattern::processMidiTime( const midiTime & _time )
 {
-	timeMap::iterator it = m_time_map.find( _time );
-	if( it != m_time_map.end() )
+	if( m_time_map.size() > 1 )
 	{
-		m_object->setLevel( it.data() );
+		timeMap::iterator it = m_time_map.find( _time );
+		if( it != m_time_map.end() )
+		{
+			m_object->setLevel( it.data() );
+		}
 	}
 }