From 0c71ae0528a6143995697fb02023c3180ee44c18 Mon Sep 17 00:00:00 2001
From: wm4 <wm4@nowhere>
Date: Tue, 28 Oct 2014 19:48:56 +0100
Subject: player: handle DVB demuxer reloading correctly

This was probably done incorrectly in cases when the currently selected
channel had no data. I'm not sure if this codepath is functional at all,
though. Maybe not.

Untested due to lack of DVB hardware.
---
 player/loadfile.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/player/loadfile.c b/player/loadfile.c
index 46f41644c1..440b29d6a9 100644
--- a/player/loadfile.c
+++ b/player/loadfile.c
@@ -1135,6 +1135,8 @@ goto_reopen_demuxer: ;
 
     MP_VERBOSE(mpctx, "EOF code: %d  \n", mpctx->stop_play);
 
+terminate_playback:
+
     if (mpctx->stop_play == PT_RELOAD_DEMUXER) {
         mpctx->stop_play = KEEP_PLAYING;
         mpctx->playback_initialized = false;
@@ -1145,8 +1147,6 @@ goto_reopen_demuxer: ;
         goto goto_reopen_demuxer;
     }
 
-terminate_playback:
-
     mp_nav_destroy(mpctx);
 
     if (mpctx->stop_play == KEEP_PLAYING)
-- 
cgit v1.2.3