From 9c86da665f28e72d3f4503e1d73af9759c905ffe Mon Sep 17 00:00:00 2001 From: svenhoefer Date: Wed, 1 Aug 2018 19:27:45 +0200 Subject: [PATCH] - movieplayer: fix display of timeshift stop dialog ... ... if timeshift was stopped in background while playback Signed-off-by: Thilo Graf --- src/gui/movieplayer.cpp | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/gui/movieplayer.cpp b/src/gui/movieplayer.cpp index e728625b1..57345cae8 100644 --- a/src/gui/movieplayer.cpp +++ b/src/gui/movieplayer.cpp @@ -1654,7 +1654,12 @@ void CMoviePlayerGui::PlayFileLoop(void) bool timeshift_stopped = false; if (timeshift != TSHIFT_MODE_OFF) - timeshift_stopped = CRecordManager::getInstance()->ShowMenu(); + { + if (CRecordManager::getInstance()->Timeshift()) + timeshift_stopped = CRecordManager::getInstance()->ShowMenu(); + else // timeshift playback still active, but recording already stopped + timeshift_stopped = true; + } if (timeshift == TSHIFT_MODE_OFF || timeshift_stopped) {