aboutsummaryrefslogtreecommitdiff
path: root/lib/python/Plugins/Extensions/DVDPlayer/src
diff options
context:
space:
mode:
authoracid-burn <acid-burn@opendreambox.org>2010-11-25 18:46:39 +0100
committeracid-burn <acid-burn@opendreambox.org>2010-11-25 18:46:39 +0100
commit078ca324e9e5e3446b9b61fb48b917f937aad762 (patch)
tree992ff4d6259bc3d84c9e1cfaae0306bde04d49fc /lib/python/Plugins/Extensions/DVDPlayer/src
parentd0cddddad18d416957a0cd37d343312f72818acc (diff)
parent579da0e777130e0947e7e4cacad19cc4a154d978 (diff)
downloadenigma2-078ca324e9e5e3446b9b61fb48b917f937aad762.tar.gz
enigma2-078ca324e9e5e3446b9b61fb48b917f937aad762.zip
Merge commit 'origin/acid-burn/bug_439_dvdplayer_missing_titlestring' into experimental
Diffstat (limited to 'lib/python/Plugins/Extensions/DVDPlayer/src')
-rw-r--r--lib/python/Plugins/Extensions/DVDPlayer/src/servicedvd.cpp5
1 files changed, 4 insertions, 1 deletions
diff --git a/lib/python/Plugins/Extensions/DVDPlayer/src/servicedvd.cpp b/lib/python/Plugins/Extensions/DVDPlayer/src/servicedvd.cpp
index 2ba53927..4ef00ab0 100644
--- a/lib/python/Plugins/Extensions/DVDPlayer/src/servicedvd.cpp
+++ b/lib/python/Plugins/Extensions/DVDPlayer/src/servicedvd.cpp
@@ -480,7 +480,10 @@ RESULT eServiceDVD::getName(std::string &name)
if ( m_ddvd_titlestring[0] != '\0' )
name = m_ddvd_titlestring;
else
- name = m_ref.path;
+ if ( !m_ref.name.empty() )
+ name = m_ref.name;
+ else
+ name = m_ref.path;
return 0;
}