[MPlayer-dev-eng] [PATCH] bad uninit on DVB channel switching

[Reimar Döffinger]

Hello,
currently switching DVB channels causes console input to stop working
and the Gui to crash, and the vo to always reinit even with -fixed-vo.
Reason: the "goto goto_enable_cache;" jumps into the middle of the
MPlayer init process, so we may not uninit stuff like getch2 and gui.
Attached patch should fix it.
P.S. might be a better idea to specify the things that should be
reinited instead of those that should not in this case. Not sure though.

Greetings,
Reimar Döffinger
-------------- next part --------------
Index: mplayer.c
===================================================================
--- mplayer.c	(revision 22419)
+++ mplayer.c	(working copy)
@@ -3586,7 +3586,7 @@
 if(mpctx->dvbin_reopen)
 {
   mpctx->eof = 0;
-  uninit_player(INITED_ALL-(INITED_STREAM|INITED_INPUT));
+  uninit_player(INITED_ALL-(INITED_GUI|INITED_STREAM|INITED_INPUT|INITED_GETCH2|(fixed_vo?INITED_VO:0)));
   cache_uninit(mpctx->stream);
   mpctx->dvbin_reopen = 0;
   goto goto_enable_cache;