From 857b9ade830946fee57ce8a7844206969685d680 Mon Sep 17 00:00:00 2001 From: "[CST] Focus" Date: Mon, 22 Sep 2014 15:42:53 +0400 Subject: [PATCH] gui/movieplayer.cpp: fix crash, always copy movie info, pointer invalidated on milist.clear() --- src/gui/movieplayer.cpp | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/src/gui/movieplayer.cpp b/src/gui/movieplayer.cpp index e164d229f..8c60f37b0 100644 --- a/src/gui/movieplayer.cpp +++ b/src/gui/movieplayer.cpp @@ -690,11 +690,8 @@ bool CMoviePlayerGui::PlayFileStart(void) printf("IS FILE PLAYER: %s\n", is_file_player ? "true": "false" ); if (p_movie_info) { - if (timeshift != TSHIFT_MODE_OFF) { - // p_movie_info may be invalidated by CRecordManager while we're still using it. Create and use a copy. - movie_info = *p_movie_info; - p_movie_info = &movie_info; - } + movie_info = *p_movie_info; + p_movie_info = &movie_info; duration = p_movie_info->length * 60 * 1000; int percent = CZapit::getInstance()->GetPidVolume(p_movie_info->epgId, currentapid, currentac3 == 1);