diff options
| author | ghost <andreas.monzner@multimedia-labs.de> | 2010-11-25 16:15:47 +0100 |
|---|---|---|
| committer | ghost <andreas.monzner@multimedia-labs.de> | 2010-11-25 16:15:47 +0100 |
| commit | d0cddddad18d416957a0cd37d343312f72818acc (patch) | |
| tree | d83dd2c7e42a417ef365e0de2665069c8bc3cbf3 /lib/service/servicedvb.cpp | |
| parent | cdfd7a570b5b0813c8f62fc76deed949d7a11803 (diff) | |
| parent | 93979892e9d66d3f31b84ac0e3399e95a77f76c2 (diff) | |
| download | enigma2-d0cddddad18d416957a0cd37d343312f72818acc.tar.gz enigma2-d0cddddad18d416957a0cd37d343312f72818acc.zip | |
Merge branch 'master' into experimental
Diffstat (limited to 'lib/service/servicedvb.cpp')
| -rw-r--r-- | lib/service/servicedvb.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/service/servicedvb.cpp b/lib/service/servicedvb.cpp index e77cbc51..6a464aff 100644 --- a/lib/service/servicedvb.cpp +++ b/lib/service/servicedvb.cpp @@ -309,7 +309,9 @@ eStaticServiceDVBPVRInformation::eStaticServiceDVBPVRInformation(const eServiceR RESULT eStaticServiceDVBPVRInformation::getName(const eServiceReference &ref, std::string &name) { ASSERT(ref == m_ref); - if (m_parser.m_name.size()) + if (!ref.name.empty()) + name = ref.name; + else if (!m_parser.m_name.empty()) name = m_parser.m_name; else { |