RepoMirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2025-01-03 05:22:23 +00:00
Code Issues Releases Wiki Activity

Make libmenu init and uninit in proper place.

Browse Source 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25461 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
ulion 2007-12-19 08:42:18 +00:00
parent 4a901e4db0
commit fafef9cb9d
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
mplayer.c
View File

@ -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);