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

diff --git a/lib/gui/epixmap.cpp b/lib/gui/epixmap.cpp
index 31998c1e..4e15b4eb 100644
--- a/lib/gui/epixmap.cpp
+++ b/lib/gui/epixmap.cpp
@@ -22,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);
 }