git.cweiske.de
/
enigma2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
add cancelenq
[enigma2.git]
/
lib
/
gui
/
epixmap.cpp
diff --git
a/lib/gui/epixmap.cpp
b/lib/gui/epixmap.cpp
index ca3e456275de817cebab05c99da3d227bd663d61..e4e4acc31300ac0f007ec8f6dcdddc65f24891c3 100644
(file)
--- a/
lib/gui/epixmap.cpp
+++ b/
lib/gui/epixmap.cpp
@@
-14,11
+14,7
@@
void ePixmap::setPixmap(gPixmap *pixmap)
void ePixmap::setPixmapFromFile(const char *filename)
{
void ePixmap::setPixmapFromFile(const char *filename)
{
- // use direct filename for absolute path or relative to enigma2 DATADIR otherwise
- if (filename[0] == '/')
- loadPNG(m_pixmap, filename);
- else
- loadPNG(m_pixmap, strcat(DATADIR "/enigma2/", filename));
+ loadPNG(m_pixmap, filename);
// TODO
getDesktop()->makeCompatiblePixmap(*m_pixmap);
// TODO
getDesktop()->makeCompatiblePixmap(*m_pixmap);