ilikecats/stk-code_catmod
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Don't poll irrlicht device without graphics

Browse Source 
It fixed crashes for joystick event which does XResetScreenSaver
This commit is contained in:
Benau 2019-11-07 09:40:52 +08:00
parent 310caebc34
commit 148dc49817
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/guiengine/engine.cpp
View File

@ -1425,9 +1425,12 @@ namespace GUIEngine
// This will avoid no response in windows, also allow showing loading // This will avoid no response in windows, also allow showing loading
// icon in apple device, because apple device only update render // icon in apple device, because apple device only update render
// buffer if you poll the mainloop // buffer if you poll the mainloop
g_device->setEventReceiver(NULL); if (!ProfileWorld::isNoGraphics())
g_device->run(); {
g_device->setEventReceiver(EventHandler::get()); g_device->setEventReceiver(NULL);
g_device->run();
g_device->setEventReceiver(EventHandler::get());
}
// If launch is finished, pause & display the story mode timers // If launch is finished, pause & display the story mode timers
if ( !launching) if ( !launching)

5
src/main_loop.cpp
View File

@ -641,8 +641,9 @@ void MainLoop::renderGUI(int phase, int loop_index, int loop_size)
#ifdef SERVER_ONLY #ifdef SERVER_ONLY
return; return;
#else #else
if (NetworkConfig::get()->isNetworking() && if ((NetworkConfig::get()->isNetworking() &&
NetworkConfig::get()->isServer() ) NetworkConfig::get()->isServer()) ||
ProfileWorld::isNoGraphics())
{ {
return; return;
} }