diff options
| author | ghost <andreas.monzner@multimedia-labs.de> | 2010-12-13 13:18:48 +0100 |
|---|---|---|
| committer | ghost <andreas.monzner@multimedia-labs.de> | 2010-12-13 13:18:48 +0100 |
| commit | 8e8c24e32fa4d314fcc3754226ab04c5799a5148 (patch) | |
| tree | af072c93a436f6ab796e62c0f6715f4e7d1b9e74 /lib/python/Plugins/Extensions/DVDPlayer/src | |
| parent | c33214ce30a9caa31bccfb88c629cd30a0b58635 (diff) | |
| parent | 91e6234a82c8dda473c0112e99e151e3c324d786 (diff) | |
| download | enigma2-8e8c24e32fa4d314fcc3754226ab04c5799a5148.tar.gz enigma2-8e8c24e32fa4d314fcc3754226ab04c5799a5148.zip | |
Merge remote branch 'remotes/origin/acid-burn/bug_439_dvdplayer_missing_titlestring'
Diffstat (limited to 'lib/python/Plugins/Extensions/DVDPlayer/src')
| -rw-r--r-- | lib/python/Plugins/Extensions/DVDPlayer/src/servicedvd.cpp | 6 |
1 files changed, 5 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..5fbfb0aa 100644 --- a/lib/python/Plugins/Extensions/DVDPlayer/src/servicedvd.cpp +++ b/lib/python/Plugins/Extensions/DVDPlayer/src/servicedvd.cpp @@ -32,6 +32,7 @@ eServiceFactoryDVD::eServiceFactoryDVD() { std::list<std::string> extensions; extensions.push_back("iso"); + extensions.push_back("img"); sc->addServiceFactory(eServiceFactoryDVD::id, this, extensions); } } @@ -480,7 +481,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; } |