From cbc6c5867f0385bdb430ebaf2581ebb4a236e365 Mon Sep 17 00:00:00 2001
From: "[CST] Focus" <focus.cst@gmail.com>
Date: Wed, 4 Sep 2013 17:39:45 +0400
Subject: [PATCH] gui/movieplayer.cpp: fix for
 6fe70ff17d25a35c0c6739dd6a8f8aaaa835a67d, audio tracks not cleared

---
 src/gui/movieplayer.cpp | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/gui/movieplayer.cpp b/src/gui/movieplayer.cpp
index 3df95b891..f3ff70c3b 100644
--- a/src/gui/movieplayer.cpp
+++ b/src/gui/movieplayer.cpp
@@ -191,6 +191,12 @@ int CMoviePlayerGui::exec(CMenuTarget * parent, const std::string & actionKey)
 
 	Cleanup();
 
+	isMovieBrowser = false;
+	isBookmark = false;
+	timeshift = 0;
+	isHTTP = false;
+	isUPNP = false;
+
 	if (actionKey == "tsmoviebrowser") {
 		isMovieBrowser = true;
 		moviebrowser->setMode(MB_SHOW_RECORDS);
@@ -218,7 +224,6 @@ int CMoviePlayerGui::exec(CMenuTarget * parent, const std::string & actionKey)
 #endif
 	else if (actionKey == "upnp") {
 		isUPNP = true;
-		p_movie_info = NULL;
 		is_file_player = 1;
 		PlayFile();
 	}
@@ -327,11 +332,6 @@ void CMoviePlayerGui::Cleanup()
 	numsubs = 0;
 
 	startposition = 0;
-	isMovieBrowser = false;
-	isBookmark = false;
-	timeshift = 0;
-	isHTTP = false;
-	isUPNP = false;
 	is_file_player = false;
 	p_movie_info = NULL;
 }
@@ -341,6 +341,7 @@ bool CMoviePlayerGui::SelectFile()
 	bool ret = false;
 	menu_ret = menu_return::RETURN_REPAINT;
 
+	Cleanup();
 	file_name = "";
 	full_name = "";