AxioDL/metaforce
2
0
Fork 0
mirror of https://github.com/AxioDL/metaforce.git synced 2025-12-08 21:47:42 +00:00
Code Issues Projects Releases Wiki Activity

PATH cooking bug fix

Browse Source
This commit is contained in:
Jack Andersen
2018-02-26 00:38:50 -10:00
parent 3acb9c9e3d
commit f2d6f643c9
3 changed files with 100 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
hecl/lib/Blender/Connection.cpp
View File

@@ -180,13 +180,21 @@ err:
size_t Connection::_readBuf(void* buf, size_t len)
{
int ret = Read(m_readpipe[0], buf, len);
if (ret < 0)
goto err;
if (len >= 4)
if (!memcmp((char*)buf, "EXCEPTION", std::min(len, size_t(9))))
_blenderDied();
return ret;
uint8_t* cBuf = reinterpret_cast<uint8_t*>(buf);
size_t readLen = 0;
do
{
int ret = Read(m_readpipe[0], cBuf, len);
if (ret < 0)
goto err;
if (len >= 4)
if (!memcmp((char*) cBuf, "EXCEPTION", std::min(len, size_t(9))))
_blenderDied();
readLen += ret;
cBuf += ret;
len -= ret;
} while (len);
return readLen;
err:
_blenderDied();
return 0;
@@ -194,10 +202,18 @@ err:
size_t Connection::_writeBuf(const void* buf, size_t len)
{
int ret = Write(m_writepipe[1], buf, len);
if (ret < 0)
goto err;
return ret;
const uint8_t* cBuf = reinterpret_cast<const uint8_t*>(buf);
size_t writeLen = 0;
do
{
int ret = Write(m_writepipe[1], cBuf, len);
if (ret < 0)
goto err;
writeLen += ret;
cBuf += ret;
len -= ret;
} while (len);
return writeLen;
err:
_blenderDied();
return 0;