diff options
author | ulion <ulion@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2007-12-19 08:42:18 +0000 |
---|---|---|
committer | ulion <ulion@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2007-12-19 08:42:18 +0000 |
commit | fafef9cb9ddb55df98044dd824baa9207ee8a12e (patch) | |
tree | b5a6c4a434db99d1cd529be9596233445a922c3a /mplayer.c | |
parent | 4a901e4db0f9c71e70a16c40d5dd1dba04732583 (diff) | |
download | mpv-fafef9cb9ddb55df98044dd824baa9207ee8a12e.tar.bz2 mpv-fafef9cb9ddb55df98044dd824baa9207ee8a12e.tar.xz |
Make libmenu init and uninit in proper place.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25461 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'mplayer.c')
-rw-r--r-- | mplayer.c | 10 |
1 files changed, 7 insertions, 3 deletions
@@ -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); |