Dismiss the on screen keyboard too when shutdown

This commit is contained in:
Benau 2018-10-24 14:32:01 +08:00
parent d3db5d8808
commit ce8125b03a

View File

@ -28,6 +28,7 @@
#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"
#include "guiengine/screen_keyboard.hpp"
#include "input/input_manager.hpp" #include "input/input_manager.hpp"
#include "modes/profile_world.hpp" #include "modes/profile_world.hpp"
#include "modes/world.hpp" #include "modes/world.hpp"
@ -339,7 +340,7 @@ void MainLoop::run()
{ {
bool exist_host = STKHost::existHost(); bool exist_host = STKHost::existHost();
core::stringw msg = _("Server connection timed out."); core::stringw msg = _("Server connection timed out.");
if (!m_request_abort) if (!m_request_abort)
{ {
if (!ProfileWorld::isNoGraphics()) if (!ProfileWorld::isNoGraphics())
@ -351,7 +352,7 @@ void MainLoop::run()
} }
} }
} }
if (exist_host == true) if (exist_host == true)
{ {
STKHost::get()->shutdown(); STKHost::get()->shutdown();
@ -368,16 +369,17 @@ void MainLoop::run()
irr_driver->getActualScreenSize().Height); irr_driver->getActualScreenSize().Height);
} }
#endif #endif
// In case the user opened a race pause dialog // In case the user opened a race pause dialog
GUIEngine::ModalDialog::dismiss(); GUIEngine::ModalDialog::dismiss();
GUIEngine::ScreenKeyboard::dismiss();
if (World::getWorld()) if (World::getWorld())
{ {
race_manager->clearNetworkGrandPrixResult(); race_manager->clearNetworkGrandPrixResult();
race_manager->exitRace(); race_manager->exitRace();
} }
if (exist_host == true) if (exist_host == true)
{ {
if (!ProfileWorld::isNoGraphics()) if (!ProfileWorld::isNoGraphics())
@ -389,7 +391,7 @@ void MainLoop::run()
NetworkConfig::get()->unsetNetworking(); NetworkConfig::get()->unsetNetworking();
} }
if (m_request_abort) if (m_request_abort)
{ {
m_abort = true; m_abort = true;