X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/c5f61282a2391235e05ff40bc40a2f0852ea1a9f..a5d197928d1660c95ef7891eb21e4941f89ca1c0:/lib/gui/epixmap.cpp

diff --git a/lib/gui/epixmap.cpp b/lib/gui/epixmap.cpp
index 3a377f14..4e15b4eb 100644
--- a/lib/gui/epixmap.cpp
+++ b/lib/gui/epixmap.cpp
@@ -10,6 +10,7 @@ ePixmap::ePixmap(eWidget *parent)
 void ePixmap::setAlphatest(bool alphatest)
 {
 	m_alphatest = alphatest;
+	setTransparent(alphatest);
 }
 
 void ePixmap::setPixmap(gPixmap *pixmap)
@@ -21,9 +22,15 @@ void ePixmap::setPixmap(gPixmap *pixmap)
 void ePixmap::setPixmapFromFile(const char *filename)
 {
 	loadPNG(m_pixmap, filename);
-		
-		// TODO
-	getDesktop()->makeCompatiblePixmap(*m_pixmap);
+	
+	if (!m_pixmap)
+	{
+		eDebug("ePixmap::setPixmapFromFile: loadPNG failed");
+		return;
+	}
+	
+		// TODO: This only works for desktop 0
+	getDesktop(0)->makeCompatiblePixmap(*m_pixmap);
 	event(evtChangedPixmap);
 }