Merge pull request #1141 from tresf/stable-1.1

Fix AFP crash, bump version Tested by @DeRobyJ, merging.
LMMS · Sep 8, 2014 · 7fdb52c · 7fdb52c
2 parents 02dd2cf + c01799e
commit 7fdb52c
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -15,7 +15,7 @@ INCLUDE(FindPkgConfig)
 
 SET(VERSION_MAJOR "1")
 SET(VERSION_MINOR "0")
-SET(VERSION_PATCH "93")
+SET(VERSION_PATCH "95")
 #SET(VERSION_SUFFIX "")
 SET(VERSION "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}")
 IF(VERSION_SUFFIX)

diff --git a/plugins/audio_file_processor/audio_file_processor.cpp b/plugins/audio_file_processor/audio_file_processor.cpp
@@ -362,10 +362,10 @@ void audioFileProcessor::startPointChanged( void )
 		m_startPointModel.setValue( tmp );
 	}
 
-	// check if start & end overlap and nudge end up if so
-	if( m_startPointModel.value() == m_endPointModel.value() )
+	// nudge loop point with end
+	if( m_loopPointModel.value() >= m_endPointModel.value() )
 	{
-		m_endPointModel.setValue( qMin( m_endPointModel.value() + 0.001f, 1.0f ) );
+		m_loopPointModel.setValue( qMax( m_endPointModel.value() - 0.001f, 0.0f ) );
 	}
 
 	// nudge loop point with start
@@ -374,10 +374,10 @@ void audioFileProcessor::startPointChanged( void )
 		m_loopPointModel.setValue( m_startPointModel.value() );
 	}
 
-	// nudge loop point with end
-	if( m_loopPointModel.value() > m_endPointModel.value() )
+	// check if start & end overlap and nudge end up if so
+	if( m_startPointModel.value() == m_endPointModel.value() )
 	{
-		m_loopPointModel.setValue( m_endPointModel.value() );
+		m_endPointModel.setValue( qMin( m_endPointModel.value() + 0.001f, 1.0f ) );
 	}
 
 	pointChanged();