diff options
| -rw-r--r-- | src/main.cpp | 6 | ||||
| -rw-r--r-- | src/porting.cpp | 8 |
2 files changed, 10 insertions, 4 deletions
diff --git a/src/main.cpp b/src/main.cpp index 503439d10..88a258dce 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -1874,7 +1874,7 @@ int main(int argc, char *argv[]) /*
Menu-game loop
*/
- while(g_device->run())
+ while(g_device->run() && kill == false)
{
// This is used for catching disconnects
@@ -1886,7 +1886,7 @@ int main(int argc, char *argv[]) Loop quits when menu returns proper parameters.
*/
- for(;;)
+ while(kill == false)
{
// Cursor can be non-visible when coming from the game
device->getCursorControl()->setVisible(true);
@@ -2179,7 +2179,7 @@ int main(int argc, char *argv[]) // NOTE: So we have to use getTime() and call run()s between them
u32 lasttime = device->getTimer()->getTime();
- while(device->run())
+ while(device->run() && kill == false)
{
if(g_disconnect_requested)
{
diff --git a/src/porting.cpp b/src/porting.cpp index 50605587d..97b028236 100644 --- a/src/porting.cpp +++ b/src/porting.cpp @@ -25,6 +25,7 @@ with this program; if not, write to the Free Software Foundation, Inc., #include "porting.h" #include "config.h" +#include "debug.h" namespace porting { @@ -47,8 +48,13 @@ void sigint_handler(int sig) { if(g_killed == false) { - dstream<<DTIME<<"sigint_handler(): " + dstream<<DTIME<<"INFO: sigint_handler(): " <<"Ctrl-C pressed, shutting down."<<std::endl; + + dstream<<DTIME<<"INFO: siging_handler(): " + <<"Printing debug stacks"<<std::endl; + debug_stacks_print(); + g_killed = true; } else |