oss/luanti
oss/luanti
1
0
Fork 0
mirror of https://github.com/luanti-org/luanti.git synced 2025-06-27 16:36:03 +00:00
Code Wiki Activity

Allow SIGINT to kill mainmenu again

Browse source
This commit is contained in:
Kahrl 2013-08-19 14:55:38 +02:00
parent 4242782dc2
commit ade70fe4b9
5 changed files with 11 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/main.cpp
View file

@ -1519,7 +1519,6 @@ int main(int argc, char *argv[])
// Initialize menu data
MainMenuData menudata;
menudata.kill = kill;
menudata.address = address;
menudata.name = playername;
menudata.port = itos(port);
@ -1565,13 +1564,11 @@ int main(int argc, char *argv[])
}
infostream<<"Waited for other menus"<<std::endl;
GUIEngine* temp = new GUIEngine(device, guiroot, &g_menumgr,smgr,&menudata);
GUIEngine* temp = new GUIEngine(device, guiroot, &g_menumgr,smgr,&menudata,kill);
delete temp;
//once finished you'll never end up here
smgr->clear();
kill = menudata.kill;
}
if(menudata.errormessage != ""){