git.cweiske.de
/
enigma2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'bug_624_change_handylike_char_input'
[enigma2.git]
/
lib
/
python
/
Plugins
/
Extensions
/
DVDPlayer
/
src
/
servicedvd.cpp
diff --git
a/lib/python/Plugins/Extensions/DVDPlayer/src/servicedvd.cpp
b/lib/python/Plugins/Extensions/DVDPlayer/src/servicedvd.cpp
index 2ba53927f6b62a89afd4cdf540aeb6bcea4db6b3..5fbfb0aa3d45f3b69e2bac4949baf2b7212e8f2b 100644
(file)
--- 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");
{
std::list<std::string> extensions;
extensions.push_back("iso");
+ extensions.push_back("img");
sc->addServiceFactory(eServiceFactoryDVD::id, this, extensions);
}
}
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
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;
}
return 0;
}