minenux/minetest-engine-multicraft2
1
0
Fork 0
Code Releases Activity

Fixed possible crash when close event is received during media loading

Browse Source
This commit is contained in:
Deve 2023-10-05 11:19:37 +02:00 committed by mckaygerhard
parent 80d583e219
commit f783bdb170
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/client/game.cpp
View File

@ -1530,6 +1530,8 @@ bool Game::connectToServer(const GameStartData &start_data,
Wait for server to accept connection Wait for server to accept connection
*/ */
bool result = true;
try { try {
input->clear(); input->clear();
@ -1539,7 +1541,7 @@ bool Game::connectToServer(const GameStartData &start_data,
fps_control.last_time = RenderingEngine::get_timer_time(); fps_control.last_time = RenderingEngine::get_timer_time();
while (RenderingEngine::run()) { while ((result = RenderingEngine::run())) {
limitFps(&fps_control, &dtime); limitFps(&fps_control, &dtime);
@ -1603,7 +1605,7 @@ bool Game::connectToServer(const GameStartData &start_data,
return false; return false;
} }
return true; return result;
} }
bool Game::getServerContent(bool *aborted) bool Game::getServerContent(bool *aborted)
@ -1615,7 +1617,8 @@ bool Game::getServerContent(bool *aborted)
fps_control.last_time = RenderingEngine::get_timer_time(); fps_control.last_time = RenderingEngine::get_timer_time();
while (RenderingEngine::run()) { bool result = true;
while ((result = RenderingEngine::run())) {
limitFps(&fps_control, &dtime); limitFps(&fps_control, &dtime);
@ -1691,7 +1694,7 @@ bool Game::getServerContent(bool *aborted)
} }
} }
return true; return result;
} }