[OMPT-svn-commit] OpenMPT r20312 - in branches/OpenMPT-1.31: . mptrack

[<sv...@op...>]

Author: sagamusix
Date: Tue Mar 12 20:14:31 2024
New Revision: 20312
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20312

Log:
Merged revision(s) 20311 from trunk/OpenMPT:
[Imp] Sample tab: Avoid holding audio lock while updating UI after pasting a sample.
........

Modified:
   branches/OpenMPT-1.31/   (props changed)
   branches/OpenMPT-1.31/mptrack/View_smp.cpp

Modified: branches/OpenMPT-1.31/mptrack/View_smp.cpp
==============================================================================
--- branches/OpenMPT-1.31/mptrack/View_smp.cpp	Tue Mar 12 20:14:12 2024	(r20311)
+++ branches/OpenMPT-1.31/mptrack/View_smp.cpp	Tue Mar 12 20:14:31 2024	(r20312)
@@ -2713,6 +2713,7 @@
 			int16 *pNewSample = static_cast<int16 *>(ModSample::AllocateSample(newLength, 2u * newNumChannels));
 			if(pNewSample == nullptr)
 			{
+				cs.Leave();
 				ErrorBox(IDS_ERR_OUTOFMEMORY, this);
 				ok = false;
 			} else
@@ -2792,6 +2793,7 @@
 		{
 			SetCurSel(selBegin, selEnd);
 			sample.PrecomputeLoops(sndFile, true);
+			cs.Leave();
 			SetModified(SampleHint().Info().Data().Names(), true, false);
 			if(pasteMode == PasteMode::Replace)
 			{