1
0
Fork 0
mirror of https://github.com/juce-framework/JUCE.git synced 2026-01-09 23:34:20 +00:00

Fixed a bug in the previous commit

This commit is contained in:
ed 2020-03-09 14:43:15 +00:00
parent 5cf2802a00
commit f9961e9938

View file

@ -188,21 +188,15 @@ public:
int read (char* dest, int numBytes)
{
int numDone = 0, dataLength = 0;
{
const ScopedLock sl (dataLock);
dataLength = (int) [data length];
}
int numDone = 0;
while (numBytes > 0)
{
auto available = jmin (numBytes, dataLength);
const ScopedLock sl (dataLock);
auto available = jmin (numBytes, (int) [data length]);
if (available > 0)
{
const ScopedLock sl (dataLock);
[data getBytes: dest length: (NSUInteger) available];
[data replaceBytesInRange: NSMakeRange (0, (NSUInteger) available) withBytes: nil length: 0];
@ -215,6 +209,7 @@ public:
if (hasFailed || hasFinished)
break;
const ScopedUnlock ul (dataLock);
Thread::sleep (1);
}
}
@ -749,21 +744,15 @@ public:
int read (char* dest, int numBytes)
{
int numDone = 0, dataLength = 0;
{
const ScopedLock sl (dataLock);
dataLength = (int) [data length];
}
int numDone = 0;
while (numBytes > 0)
{
auto available = jmin (numBytes, dataLength);
const ScopedLock sl (dataLock);
auto available = jmin (numBytes, (int) [data length]);
if (available > 0)
{
const ScopedLock sl (dataLock);
[data getBytes: dest length: (NSUInteger) available];
[data replaceBytesInRange: NSMakeRange (0, (NSUInteger) available) withBytes: nil length: 0];
@ -776,6 +765,7 @@ public:
if (hasFailed || hasFinished)
break;
const ScopedUnlock sul (dataLock);
Thread::sleep (1);
}
}