Merge pull request #2106 from block8437/development

Areloch · Areloch · commit 27446b1d6a07 · 2018-04-03T21:24:43.000-05:00
Fixed a typo where the value of outBytesWritten was being clamped incorrectly.
diff --git a/Engine/source/platform/platformNet.cpp b/Engine/source/platform/platformNet.cpp
@@ -1706,7 +1706,7 @@ Net::Error Net::send(NetSocket handleFd, const U8 *buffer, S32 bufferSize, S32 *
 
    if (outBytesWritten)
    {
-      *outBytesWritten = outBytesWritten < 0 ? 0 : bytesWritten;
+      *outBytesWritten = *outBytesWritten < 0 ? 0 : bytesWritten;
    }
 
    return PlatformNetState::getLastError();

Original file line number	Diff line number	Diff line change
`@@ -1706,7 +1706,7 @@ Net::Error Net::send(NetSocket handleFd, const U8 buffer, S32 bufferSize, S32 `
`1706`	`1706`
`1707`	`1707`	`if (outBytesWritten)`
`1708`	`1708`	`{`
`1709`		`- *outBytesWritten = outBytesWritten < 0 ? 0 : bytesWritten;`
	`1709`	`+ outBytesWritten = outBytesWritten < 0 ? 0 : bytesWritten;`
`1710`	`1710`	`}`
`1711`	`1711`
`1712`	`1712`	`return PlatformNetState::getLastError();`