diff --git a/src/gui/epgview.cpp b/src/gui/epgview.cpp index 3ef195aff..9e66c081c 100644 --- a/src/gui/epgview.cpp +++ b/src/gui/epgview.cpp @@ -244,7 +244,7 @@ void CEpgData::processTextToArray(std::string text, int screening, bool has_cove void CEpgData::showText(int startPos, int ypos, bool has_cover, bool fullClear) { Font* font = g_Font[SNeutrinoSettings::FONT_TYPE_EPG_INFO2]; - std::string cover = tmdb->getCover(); + std::string cover = ""; int cover_max_width = ox/4; //25% int cover_max_height = sb-(2*OFFSET_INNER_MID); int cover_width = 0; @@ -255,6 +255,8 @@ void CEpgData::showText(int startPos, int ypos, bool has_cover, bool fullClear) { if (imdb_active) cover = imdb->posterfile; + else if (tmdb_active) + cover = tmdb->getCover(); g_PicViewer->getSize(cover.c_str(), &cover_width, &cover_height); if (cover_width && cover_height) @@ -727,6 +729,8 @@ int CEpgData::show(const t_channel_id channel_id, uint64_t a_id, time_t* a_start startzeit=*a_startzeit; id=a_id; + imdb_active = false; + imdb_stars = 0; tmdb_active = false; tmdb_stars = 0; @@ -1014,9 +1018,6 @@ int CEpgData::show(const t_channel_id channel_id, uint64_t a_id, time_t* a_start CNeutrinoApp::getInstance()->handleMsg(msg, data); break; case CRCInput::RC_left: - if(imdb_active) - imdb_active = false; - if ((prev_id != 0) && !call_fromfollowlist && !mp_info) { toph = topboxheight; @@ -1025,9 +1026,6 @@ int CEpgData::show(const t_channel_id channel_id, uint64_t a_id, time_t* a_start } break; case CRCInput::RC_right: - if(imdb_active) - imdb_active = false; - if ((next_id != 0) && !call_fromfollowlist && !mp_info) { toph = topboxheight; @@ -1199,19 +1197,19 @@ int CEpgData::show(const t_channel_id channel_id, uint64_t a_id, time_t* a_start if ((tmdb->getResults() > 0) && (!tmdb->getDescription().empty())) { epgText_saved = epgText; epgText.clear(); - tmdb_active = !tmdb_active; + tmdb_active = true; epgTextSwitch = tmdb->CreateMovieText(); processTextToArray(tmdb->CreateEPGText(), 0, tmdb->hasCover()); textCount = epgText.size(); tmdb_stars = tmdb->getStars(); - showText(showPos, sy + toph, tmdb_active || (imdb_active && imdb->gotPoster())); + showText(showPos, sy + toph, tmdb_active); } else { ShowMsg(LOCALE_MESSAGEBOX_INFO, LOCALE_EPGVIEWER_NODETAILED, CMsgBox::mbrOk , CMsgBox::mbrOk); } } else { epgText = epgText_saved; textCount = epgText.size(); - tmdb_active = !tmdb_active; + tmdb_active = false; tmdb_stars=0; showText(showPos, sy + toph); }