backups/4jcraft
2
0
Fork 0
mirror of https://github.com/4jcraft/4jcraft.git synced 2026-05-21 20:42:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch '4jcraft:dev' into issue/51-phase-1-portable-win32-cleanup

Browse source
This commit is contained in:
MatthewBeshay 2026-03-11 06:44:56 +11:00 committed by GitHub
parent d8ed82d703 750436d815
commit ca942717cb
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Minecraft.Client/Platform/Common/Network/GameNetworkManager.cpp
View file

@ -1108,7 +1108,7 @@ int CGameNetworkManager::ChangeSessionTypeThreadProc( void* lpParam )
app.SetXuiServerAction(ProfileManager.GetPrimaryPad(),eXuiServerAction_PauseServer,(void *)TRUE);
// wait for the server to be in a non-ticking state
pServer->m_serverPausedEvent->WaitForSignal(INFINITY);
pServer->m_serverPausedEvent->WaitForSignal(INFINITE);
#if defined(__PS3__) || defined(__ORBIS__) || defined __PSVITA__
// Swap these two messages around as one is too long to display at 480
@ -1926,7 +1926,7 @@ void CGameNetworkManager::ServerReadyWait()
{
if (m_hServerReadyEvent != NULL)
{
m_hServerReadyEvent->WaitForSignal(INFINITY);
m_hServerReadyEvent->WaitForSignal(INFINITE);
}
else
{
@ -1990,7 +1990,7 @@ void CGameNetworkManager::ServerStoppedWait()
{
if (m_hServerStoppedEvent != NULL)
{
m_hServerStoppedEvent->WaitForSignal(INFINITY);
m_hServerStoppedEvent->WaitForSignal(INFINITE);
}
else
{

2
Minecraft.Client/Platform/Linux/Linux_App.cpp
View file

@ -32,6 +32,8 @@ void CConsoleMinecraftApp::ExitGame()
}
void CConsoleMinecraftApp::FatalLoadError()
{
app.DebugPrintf("CConsoleMinecraftApp::FatalLoadError - asserting 0 and dying...\n");
assert(0);
}
void CConsoleMinecraftApp::CaptureSaveThumbnail()