swg-source/src
1
0
Fork 0
mirror of https://github.com/SWG-Source/src.git synced 2026-07-29 23:15:56 -04:00
Code Issues Projects Releases Wiki Activity

squash bugs

Browse Source
This commit is contained in:
DarthArgus
2015-10-27 21:19:20 -05:00
parent ab9c60957f
commit bd4f3699c2
4 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
engine/server/application/ConnectionServer/src/shared/ClientConnection.cpp
+1 -1
View File
@@ -1006,7 +1006,7 @@ void ClientConnection::onReceive(const Archive::ByteStream & message)
else
{
//Forward on to Game Server
DEBUG_REPORT_LOG(!m_client || !m_client->getGameConnection()), ("Warn, received game message with no game connection. This may happen for a short time after a GameServer crashes. If it continues to happen, it indicates a bug.\n");
DEBUG_REPORT_LOG((!m_client || !m_client->getGameConnection()), ("Warn, received game message with no game connection. This may happen for a short time after a GameServer crashes. If it continues to happen, it indicates a bug.\n"));
if (m_client && m_client->getGameConnection())
{
engine/server/library/serverScript/src/shared/JavaLibrary.cpp
-1
View File
@@ -1283,7 +1283,6 @@ void JavaLibrary::initializeJavaThread()
strcpy(profileBuffer,"-Xrunhprof:cpu=times");
tempOption.optionString = profileBuffer;
options.push_back(tempOption);
delete [] profileBuffer;
}
else
{
engine/shared/library/sharedFile/src/shared/FileStreamer.cpp
+1 -1
View File
@@ -229,7 +229,7 @@ int FileStreamer::File::read(int offset, void *destinationBuffer, int numberOfBy
newRequest->bytesRead = 0;
newRequest->gate = gate;
newRequest->priority = priority;
newRequest->returnValue = returnValue;
newRequest->returnValue = &returnValue;
// submit the request
FileStreamerThread::submitRequest(newRequest);
engine/shared/library/sharedFile/src/shared/FileStreamerThread.h
+1 -1
View File
@@ -115,7 +115,7 @@ public:
AbstractFile::PriorityType priority;
// storage held by game thread used to pass back return value
int returnValue;
int *returnValue;
public: