mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-09-02 18:31:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix segfault in lcd4l if no movieinfo is present

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: bf5a3aa2f2
Author: TangoCash <eric@loxat.de>
Date: 2016-05-29 (Sun, 29 May 2016)


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

------------------
This commit was generated by Migit
This commit is contained in:
TangoCash
2016-05-29 22:39:42 +02:00
committed by vanhofen
parent 5e6aa03f9e
commit 66fcaa3a90
1 changed files with 18 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/gui/lcd4l.cpp
View File

@@ -480,8 +480,11 @@ void CLCD4l::ParseInfo(uint64_t parseID, bool newID, bool firstRun)
{ {
if (ModeTshift) if (ModeTshift)
Service = g_Locale->getText(LOCALE_RECORDINGMENU_TIMESHIFT); Service = g_Locale->getText(LOCALE_RECORDINGMENU_TIMESHIFT);
else if (!CMoviePlayerGui::getInstance().p_movie_info->epgChannel.empty()) else if (CMoviePlayerGui::getInstance().p_movie_info)
{
if (!CMoviePlayerGui::getInstance().p_movie_info->epgChannel.empty())
Service = CMoviePlayerGui::getInstance().p_movie_info->epgChannel; Service = CMoviePlayerGui::getInstance().p_movie_info->epgChannel;
}
if (Service.empty()) if (Service.empty())
Service = g_Locale->getText(LOCALE_MOVIEPLAYER_HEAD); Service = g_Locale->getText(LOCALE_MOVIEPLAYER_HEAD);
@@ -498,10 +501,13 @@ void CLCD4l::ParseInfo(uint64_t parseID, bool newID, bool firstRun)
Logo = ICONSDIR "/" NEUTRINO_ICON_PAUSE ICONSEXT; Logo = ICONSDIR "/" NEUTRINO_ICON_PAUSE ICONSEXT;
break; break;
case 3: /* play */ case 3: /* play */
if (CMoviePlayerGui::getInstance().p_movie_info)
{
if (!GetLogoName(CMoviePlayerGui::getInstance().p_movie_info->epgId, if (!GetLogoName(CMoviePlayerGui::getInstance().p_movie_info->epgId,
CMoviePlayerGui::getInstance().p_movie_info->epgChannel, CMoviePlayerGui::getInstance().p_movie_info->epgChannel,
Logo)) Logo))
Logo = ICONSDIR "/" NEUTRINO_ICON_PLAY ICONSEXT; Logo = ICONSDIR "/" NEUTRINO_ICON_PLAY ICONSEXT;
}
break; break;
default: /* show movieplayer-icon */ default: /* show movieplayer-icon */
Logo = ICONSDIR "/" NEUTRINO_ICON_MOVIEPLAYER ICONSEXT; Logo = ICONSDIR "/" NEUTRINO_ICON_MOVIEPLAYER ICONSEXT;
@@ -690,11 +696,13 @@ void CLCD4l::ParseInfo(uint64_t parseID, bool newID, bool firstRun)
//} //}
else if (parseID == MODE_TS) else if (parseID == MODE_TS)
{ {
if (!CMoviePlayerGui::getInstance().pretty_name.empty()) if (CMoviePlayerGui::getInstance().p_movie_info)
Event = CMoviePlayerGui::getInstance().pretty_name; {
if (!CMoviePlayerGui::getInstance().p_movie_info->epgTitle.empty()) if (!CMoviePlayerGui::getInstance().p_movie_info->epgTitle.empty())
Event = CMoviePlayerGui::getInstance().p_movie_info->epgTitle; Event = CMoviePlayerGui::getInstance().p_movie_info->epgTitle;
}
else if (!CMoviePlayerGui::getInstance().pretty_name.empty())
Event = CMoviePlayerGui::getInstance().pretty_name;
if (Event.empty()) if (Event.empty())
Event = "MOVIE"; Event = "MOVIE";