← Back to branch summary

~ubuntu-branches/ubuntu/trusty/vdr-plugin-skinenigmang/trusty

« back to all changes in this revision

Viewing changes to logo.c

  • Committer: Bazaar Package Importer
  • Author(s): Thomas Schmidt, Tobias Grimm
  • Date: 2008-07-19 18:13:38 UTC
  • mfrom: (2.1.4 intrepid)
  • Revision ID: james.westby@ubuntu.com-20080719181338-5gopx0a2tk1hlqvq
Tags: 0.0.6-4
[ Tobias Grimm ]
* Dropped patchlevel control field
* Build-Depend on vdr-dev (>=1.6.0-5)
* Bumped Standards-Version to 3.8.0

Show diffs side-by-side

added added

removed removed

Lines of Context:
logo.c
96
96
    return false;
97
97
 
98
98
  bool fFoundLogo = false;
99
 
  char *strChannelID = EnigmaConfig.useChannelId ? strdup(*Channel->GetChannelID().ToString()) : NULL;
100
 
  const char *logoname = EnigmaConfig.useChannelId ? strChannelID : Channel->Name();
 
99
  char *strChannelID = EnigmaConfig.useChannelId && !Channel->GroupSep() ? strdup(*Channel->GetChannelID().ToString()) : NULL;
 
100
  const char *logoname = EnigmaConfig.useChannelId && !Channel->GroupSep() ? strChannelID : Channel->Name();
101
101
  if (logoname) {
102
102
    char *filename = (char *)malloc(strlen(logoname) + 20 /* should be enough for folder */);
103
103
    if (filename == NULL) return false;