# HG changeset patch # User ulion # Date 1198053738 0 # Node ID 55e3b1a32c6520e8f7fd5e2fcabe7897074a42d8 # Parent 7957b8762195aff98fcd78555952ff1cf9d4b4cc Make libmenu init and uninit in proper place. diff -r 7957b8762195 -r 55e3b1a32c65 mplayer.c --- a/mplayer.c Wed Dec 19 08:35:40 2007 +0000 +++ b/mplayer.c Wed Dec 19 08:42:18 2007 +0000 @@ -668,6 +668,10 @@ 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 @@ 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 @@ } #endif +inited_flags|=INITED_INPUT; +current_module = NULL; + /// Catch signals #ifndef __MINGW32__ signal(SIGCHLD,child_sighandler);