diff --git a/include/mixer.h b/include/mixer.h
index 40a8c33f0..e84122049 100644
--- a/include/mixer.h
+++ b/include/mixer.h
@@ -240,10 +240,7 @@ public:
 
 	void removePlayHandles( track * _track );
 
-	inline bool hasPlayHandles() const
-	{
-		return !m_playHandles.empty();
-	}
+	bool hasNotePlayHandles();
 
 
 	// methods providing information for other classes
diff --git a/src/core/mixer.cpp b/src/core/mixer.cpp
index a36102f3f..bdb955d7a 100644
--- a/src/core/mixer.cpp
+++ b/src/core/mixer.cpp
@@ -1,7 +1,7 @@
 /*
  * mixer.cpp - audio-device-independent mixer for LMMS
  *
- * Copyright (c) 2004-2011 Tobias Doerffel <tobydox/at/users.sourceforge.net>
+ * Copyright (c) 2004-2012 Tobias Doerffel <tobydox/at/users.sourceforge.net>
  *
  * This file is part of Linux MultiMedia Studio - http://lmms.sourceforge.net
  *
@@ -965,6 +965,27 @@ void mixer::removePlayHandles( track * _track )
 
 
 
+bool mixer::hasNotePlayHandles()
+{
+	lock();
+
+	for( PlayHandleList::Iterator it = m_playHandles.begin();
+			it != m_playHandles.end(); ++it )
+	{
+		if( (*it)->type() == playHandle::NotePlayHandle )
+		{
+			unlock();
+			return true;
+		}
+	}
+
+	unlock();
+	return false;
+}
+
+
+
+
 AudioDevice * mixer::tryAudioDevices()
 {
 	bool success_ful = false;
diff --git a/src/tracks/pattern.cpp b/src/tracks/pattern.cpp
index 8110555fb..67f07fbd3 100644
--- a/src/tracks/pattern.cpp
+++ b/src/tracks/pattern.cpp
@@ -1,7 +1,7 @@
 /*
  * pattern.cpp - implementation of class pattern which holds notes
  *
- * Copyright (c) 2004-2009 Tobias Doerffel <tobydox/at/users.sourceforge.net>
+ * Copyright (c) 2004-2012 Tobias Doerffel <tobydox/at/users.sourceforge.net>
  * Copyright (c) 2005-2007 Danny McRae <khjklujn/at/yahoo.com>
  *
  * This file is part of Linux MultiMedia Studio - http://lmms.sourceforge.net
@@ -766,9 +766,12 @@ void patternFreezeThread::run()
 		m_statusDlg->setProgress( ppp * 100 / m_pattern->length() );
 	}
 	m_statusDlg->setProgress( 100 );
+
 	// render tails
-	while( engine::getMixer()->hasPlayHandles() &&
-					m_pattern->m_freezeAborted == false )
+	int count = 0;
+	while( engine::getMixer()->hasNotePlayHandles() &&
+					m_pattern->m_freezeAborted == false &&
+					++count < 2000 )
 	{
 		freeze_recorder->processNextBuffer();
 	}