[OMPT-svn-commit] SF.net SVN: modplug:[5294] trunk/OpenMPT/mptrack/Moddoc.cpp

[<sag...@us...>]

Revision: 5294
          http://sourceforge.net/p/modplug/code/5294
Author:   saga-games
Date:     2015-06-12 15:16:53 +0000 (Fri, 12 Jun 2015)
Log Message:
-----------
[Fix] Really always clean up after ourselves when rendering to sample slot.

Modified Paths:
--------------
    trunk/OpenMPT/mptrack/Moddoc.cpp

Modified: trunk/OpenMPT/mptrack/Moddoc.cpp
===================================================================
--- trunk/OpenMPT/mptrack/Moddoc.cpp	2015-06-12 15:15:05 UTC (rev 5293)
+++ trunk/OpenMPT/mptrack/Moddoc.cpp	2015-06-12 15:16:53 UTC (rev 5294)
@@ -1835,9 +1835,9 @@
 					if(smp == SAMPLEINDEX_INVALID)
 					{
 						Reporting::Error(_T("Too many samples!"));
-						break;
+						cancel = true;
 					}
-					if(m_SndFile.ReadSampleFromFile(smp, file, false))
+					if(!cancel && m_SndFile.ReadSampleFromFile(smp, file, false))
 					{
 						UpdateAllViews(nullptr, SampleHint().Info().Data().Names());
 						if(m_SndFile.GetNumInstruments())

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.