From ecf30282c93b41e966979e1c69ef3ee266ce10bc Mon Sep 17 00:00:00 2001 From: Jacek Jendrzej Date: Sun, 20 Apr 2014 21:03:21 +0200 Subject: [PATCH] make info copy only in timeshift mode Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/1bbf65c2d3dc57425e67af1798b1ad9ee0d4915d Author: Jacek Jendrzej Date: 2014-04-20 (Sun, 20 Apr 2014) Origin message was: ------------------ make info copy only in timeshift mode ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- src/gui/movieplayer.cpp | 6 ++++-- src/nhttpd/web/languages/Makefile.am | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/gui/movieplayer.cpp b/src/gui/movieplayer.cpp index c4af276b1..91bf5da72 100644 --- a/src/gui/movieplayer.cpp +++ b/src/gui/movieplayer.cpp @@ -511,9 +511,11 @@ void CMoviePlayerGui::PlayFile(void) MI_MOVIE_INFO mi; if(p_movie_info) { + if(timeshift){ // p_movie_info may be invalidated by CRecordManager while we're still using it. Create and use a copy. - mi = *p_movie_info; - p_movie_info = &mi; + mi = *p_movie_info; + p_movie_info = &mi; + } duration = p_movie_info->length * 60 * 1000; int percent = CZapit::getInstance()->GetPidVolume(p_movie_info->epgId, currentapid, currentac3 == 1); diff --git a/src/nhttpd/web/languages/Makefile.am b/src/nhttpd/web/languages/Makefile.am index ed32f57d3..036c37d42 100644 --- a/src/nhttpd/web/languages/Makefile.am +++ b/src/nhttpd/web/languages/Makefile.am @@ -1,4 +1,4 @@ installdir = $(DATADIR)/neutrino/httpd/languages -install_DATA = Deutsch English Portuguese Slovak +install_DATA = Czech Deutsch English Portuguese Slovak