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/main.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/main.cpp')
| -rw-r--r-- | src/main.cpp | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/src/main.cpp b/src/main.cpp index 05a7dd163..41acfe7b2 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -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 != ""){ |