Do not use exit_player in the signal handler, this code just can not

be called from a signal handler.
Instead only make the input system generate quit commands for the first
CTRL+C and otherwise do getch2_disable and exit.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25651 b3059339-0415-0410-9bf9-f77b7e298cf2

1 files changed, 4 insertions, 2 deletions

diff --git a/mplayer.c b/mplayer.c
index 895f5c1da1..a954b60bba 100644
--- a/mplayer.c
+++ b/mplayer.c
@@ -764,7 +764,8 @@ static void exit_sighandler(int x){
   case SIGQUIT:
   case SIGTERM:
   case SIGKILL:
-      break;  // killed from keyboard (^C) or killed [-9]
+      async_quit_request = 1;
+      return;  // killed from keyboard (^C) or killed [-9]
   case SIGILL:
 #ifdef RUNTIME_CPUDETECT
       mp_msg(MSGT_CPLAYER,MSGL_FATAL,MSGTR_Exit_SIGILL_RTCpuSel);
@@ -798,7 +799,8 @@ static void exit_sighandler(int x){
       }
 #endif  
   }
-  exit_player(NULL);
+  getch2_disable();
+  exit(1);
 }
 
 extern void mp_input_register_options(m_config_t* cfg);