From fafef9cb9ddb55df98044dd824baa9207ee8a12e Mon Sep 17 00:00:00 2001
From: ulion <ulion@b3059339-0415-0410-9bf9-f77b7e298cf2>
Date: Wed, 19 Dec 2007 08:42:18 +0000
Subject: Make libmenu init and uninit in proper place.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25461 b3059339-0415-0410-9bf9-f77b7e298cf2
---
 mplayer.c | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/mplayer.c b/mplayer.c
index 1196e705fd..55f9ff8be8 100644
--- a/mplayer.c
+++ b/mplayer.c
@@ -668,6 +668,10 @@ void uninit_player(unsigned int mask){
     inited_flags&=~INITED_INPUT;
     current_module="uninit_input";
     mp_input_uninit();
+#ifdef HAVE_MENU
+    if (use_menu)
+      menu_uninit();
+#endif
   }
 
   current_module=NULL;
@@ -2616,9 +2620,6 @@ if(slave_mode)
 else if(!noconsolecontrols)
     mp_input_add_event_fd(0, getch2);
 
-inited_flags|=INITED_INPUT;
-current_module = NULL;
-
 #ifdef HAVE_MENU
  if(use_menu) {
    if(menu_cfg && menu_init(mpctx, menu_cfg))
@@ -2639,6 +2640,9 @@ current_module = NULL;
  }
 #endif
   
+inited_flags|=INITED_INPUT;
+current_module = NULL;
+
   /// Catch signals
 #ifndef __MINGW32__
   signal(SIGCHLD,child_sighandler);
-- 
cgit v1.2.3