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

Flush all command before delete world

Browse Source
This commit is contained in:
Benau 2018-08-03 18:36:35 +08:00
parent 9d78173ec6
commit 14475762b8
1 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/main_loop.cpp
View File

@ -21,8 +21,10 @@
#include "audio/sfx_manager.hpp" #include "audio/sfx_manager.hpp"
#include "config/user_config.hpp" #include "config/user_config.hpp"
#include "graphics/central_settings.hpp"
#include "graphics/irr_driver.hpp" #include "graphics/irr_driver.hpp"
#include "graphics/material_manager.hpp" #include "graphics/material_manager.hpp"
#include "graphics/sp/sp_texture_manager.hpp"
#include "guiengine/engine.hpp" #include "guiengine/engine.hpp"
#include "guiengine/message_queue.hpp" #include "guiengine/message_queue.hpp"
#include "guiengine/modaldialog.hpp" #include "guiengine/modaldialog.hpp"
@ -339,6 +341,19 @@ void MainLoop::run()
STKHost::get()->shutdown(); STKHost::get()->shutdown();
// In case the user opened a race pause dialog // In case the user opened a race pause dialog
GUIEngine::ModalDialog::dismiss(); GUIEngine::ModalDialog::dismiss();
#ifndef SERVER_ONLY
if (CVS->isGLSL())
{
// Flush all command before delete world, avoid later access
SP::SPTextureManager::get()
->checkForGLCommand(true/*before_scene*/);
// Reset screen in case the minimap was drawn
glViewport(0, 0, irr_driver->getActualScreenSize().Width,
irr_driver->getActualScreenSize().Height);
}
#endif
if (World::getWorld()) if (World::getWorld())
{ {
race_manager->clearNetworkGrandPrixResult(); race_manager->clearNetworkGrandPrixResult();