From 57911bf00958af7dc659e16c518705e74b988c75 Mon Sep 17 00:00:00 2001 From: Stefan Seyfried Date: Wed, 21 Nov 2012 18:19:39 +0100 Subject: [PATCH] infoviewer: make oldinfo a member of the class --- src/gui/infoviewer.cpp | 4 ++-- src/gui/infoviewer.h | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/gui/infoviewer.cpp b/src/gui/infoviewer.cpp index b893dd010..0ff9a2ea1 100644 --- a/src/gui/infoviewer.cpp +++ b/src/gui/infoviewer.cpp @@ -117,6 +117,8 @@ CInfoViewer::CInfoViewer () Init(); infoViewerBB->Init(); strcpy(old_timestr, ""); + oldinfo.current_uniqueKey = 0; + oldinfo.next_uniqueKey = 0; } CInfoViewer::~CInfoViewer() @@ -1297,8 +1299,6 @@ int CInfoViewer::handleMsg (const neutrino_msg_t msg, neutrino_msg_data_t data) void CInfoViewer::getEPG(const t_channel_id for_channel_id, CSectionsdClient::CurrentNextInfo &info) { - static CSectionsdClient::CurrentNextInfo oldinfo; - /* to clear the oldinfo for channels without epg, call getEPG() with for_channel_id = 0 */ if (for_channel_id == 0) { diff --git a/src/gui/infoviewer.h b/src/gui/infoviewer.h index dc503c3fa..daf68709e 100644 --- a/src/gui/infoviewer.h +++ b/src/gui/infoviewer.h @@ -82,6 +82,7 @@ class CInfoViewer int ChanHeight; CSectionsdClient::CurrentNextInfo info_CurrentNext; + CSectionsdClient::CurrentNextInfo oldinfo; t_channel_id channel_id; //uint32_t fadeTimer;