From: Stefan Pluecken <stefan.pluecken@multimedia-labs.de>
Date: Mon, 3 Oct 2005 19:12:05 +0000 (+0000)
Subject: make epixmap load images relative to enigma2 DATADIR
X-Git-Tag: 2.6.0~5535
X-Git-Url: https://git.cweiske.de/enigma2.git/commitdiff_plain/e747d464704a12e7eaa69d4613d87fd59634fb31?ds=sidebyside

make epixmap load images relative to enigma2 DATADIR
---

diff --git a/lib/gui/epixmap.cpp b/lib/gui/epixmap.cpp
index dc998531..ca3e4562 100644
--- a/lib/gui/epixmap.cpp
+++ b/lib/gui/epixmap.cpp
@@ -14,8 +14,12 @@ void ePixmap::setPixmap(gPixmap *pixmap)
 
 void ePixmap::setPixmapFromFile(const char *filename)
 {
-	loadPNG(m_pixmap, 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));
+		
 		// TODO
 	getDesktop()->makeCompatiblePixmap(*m_pixmap);
 	event(evtChangedPixmap);