From b56357a43af1d481b7ff77dc4b1d5eacae1adae4 Mon Sep 17 00:00:00 2001
From: vanhofen <vanhofen@gmx.de>
Date: Mon, 23 Jul 2018 19:48:47 +0200
Subject: [PATCH] movieplayer/infoviewer: simplify call of showMovieInfo()

Origin commit data
------------------
Branch: ni/coolstream
Commit: https://github.com/neutrino-images/ni-neutrino/commit/3fcffe87ff595244cad8fb13fd720ba61af526be
Author: vanhofen <vanhofen@gmx.de>
Date: 2018-07-23 (Mon, 23 Jul 2018)

Origin message was:
------------------
- movieplayer/infoviewer: simplify call of showMovieInfo()

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
---
 src/gui/infoviewer.cpp  | 9 +--------
 src/gui/movieplayer.cpp | 8 +-------
 2 files changed, 2 insertions(+), 15 deletions(-)

diff --git a/src/gui/infoviewer.cpp b/src/gui/infoviewer.cpp
index 32fb3fac7..3c4ed0104 100644
--- a/src/gui/infoviewer.cpp
+++ b/src/gui/infoviewer.cpp
@@ -1138,14 +1138,7 @@ void CInfoViewer::loop(bool show_dot)
 			g_RCInput->postMsg (msg, 0);
 			res = messages_return::cancel_info;
 		} else if (msg == CRCInput::RC_info) { //NI
-			if (fileplay)
-			{
-				CMoviePlayerGui::getInstance().setFromInfoviewer(true);
-				g_RCInput->postMsg (msg, data);
-				hideIt = true;
-			}
-			else
-				g_RCInput->postMsg (NeutrinoMessages::SHOW_EPG, 0);
+			g_RCInput->postMsg(NeutrinoMessages::SHOW_EPG, 0);
 			res = messages_return::cancel_info;
 		} else if ((msg == NeutrinoMessages::EVT_TIMER) && (data == fader.GetFadeTimer())) {
 			if(fader.FadeDone())
diff --git a/src/gui/movieplayer.cpp b/src/gui/movieplayer.cpp
index 46b2b7fbc..b8a5e1bfe 100644
--- a/src/gui/movieplayer.cpp
+++ b/src/gui/movieplayer.cpp
@@ -1889,13 +1889,7 @@ void CMoviePlayerGui::PlayFileLoop(void)
 			showHelp();
 			enableOsdElements(NO_MUTE);
 		} else if (msg == CRCInput::RC_info) {
-			if (fromInfoviewer)
-			{
-				showMovieInfo();
-				fromInfoviewer = false;
-			}
-			else
-				callInfoViewer();
+			callInfoViewer();
 			update_lcd = true;
 			clearSubtitle();
 		} else if (timeshift != TSHIFT_MODE_OFF && (msg == CRCInput::RC_text || msg == CRCInput::RC_epg || msg == NeutrinoMessages::SHOW_EPG)) {