diff options
| -rw-r--r-- | magazine.cpp | 21 | ||||
| -rw-r--r-- | tvonscreen.cpp | 2 |
2 files changed, 14 insertions, 9 deletions
diff --git a/magazine.cpp b/magazine.cpp index 8dcf801..6fe82b3 100644 --- a/magazine.cpp +++ b/magazine.cpp @@ -93,19 +93,22 @@ magazine::magazine(class cPlugin *p) qsort(schedArray, num, sizeof(cSchedule*), CompareSchedules); currentFirst=0; - int currentChannel = Channels.GetByNumber(cDevice::CurrentChannel())->Number(); - for(int i=0;i<schedArrayNum;i++) + cChannel *cchannel=Channels.GetByNumber(cDevice::CurrentChannel()); + if (cchannel) { - cChannel *channel = Channels.GetByChannelID(schedArray[i]->ChannelID(), true); - if (channel->Number()==currentChannel) + int currentChannel = cchannel->Number(); + for(int i=0;i<schedArrayNum;i++) { - currentFirst=i-1; - if (currentFirst<0) - currentFirst=0; - break; + cChannel *channel = Channels.GetByChannelID(schedArray[i]->ChannelID(), true); + if (channel->Number()==currentChannel) + { + currentFirst=i-1; + if (currentFirst<0) + currentFirst=0; + break; + } } } - ev1=NULL; ev2=NULL; ev3=NULL; diff --git a/tvonscreen.cpp b/tvonscreen.cpp index 501f5a4..9f314fe 100644 --- a/tvonscreen.cpp +++ b/tvonscreen.cpp @@ -61,7 +61,9 @@ bool cPluginTvOnscreen::ProcessArgs(int argc, char *argv[]) bool cPluginTvOnscreen::Initialize(void) { // Initialize any background activities the plugin shall perform. +#if (APIVERSNUM < 10507) RegisterI18n(tvoPhrases); +#endif return true; } |