diff options
| author | Kahrl <kahrl@gmx.net> | 2013-08-19 14:55:38 +0200 |
|---|---|---|
| committer | Kahrl <kahrl@gmx.net> | 2013-08-19 15:49:36 +0200 |
| commit | ade70fe4b92202065c17d04f21415848b2c6d419 (patch) | |
| tree | 14fa79b64c8eb744082d13443a01c55ce673b53c /src/guiEngine.cpp | |
| parent | 4242782dc27e7932e050677b92ec8b1a994a4f0d (diff) | |
| download | minetest-ade70fe4b92202065c17d04f21415848b2c6d419.tar.gz minetest-ade70fe4b92202065c17d04f21415848b2c6d419.tar.bz2 minetest-ade70fe4b92202065c17d04f21415848b2c6d419.zip | |
Allow SIGINT to kill mainmenu again
Diffstat (limited to 'src/guiEngine.cpp')
| -rw-r--r-- | src/guiEngine.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/guiEngine.cpp b/src/guiEngine.cpp index f89ad8731..f00cd039c 100644 --- a/src/guiEngine.cpp +++ b/src/guiEngine.cpp @@ -79,7 +79,8 @@ GUIEngine::GUIEngine( irr::IrrlichtDevice* dev, gui::IGUIElement* parent, IMenuManager *menumgr, scene::ISceneManager* smgr, - MainMenuData* data) : + MainMenuData* data, + bool& kill) : m_device(dev), m_parent(parent), m_menumanager(menumgr), @@ -89,6 +90,7 @@ GUIEngine::GUIEngine( irr::IrrlichtDevice* dev, m_formspecgui(0), m_buttonhandler(0), m_menu(0), + m_kill(kill), m_startgame(false), m_script(0), m_scriptdir(""), @@ -219,7 +221,7 @@ void GUIEngine::run() cloudInit(); - while(m_device->run() && (!m_startgame)) { + while(m_device->run() && (!m_startgame) && (!m_kill)) { driver->beginScene(true, true, video::SColor(255,140,186,250)); if (m_clouds_enabled) |