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

diff --git a/lib/gui/epixmap.cpp b/lib/gui/epixmap.cpp
index 31998c1e..3e396c98 100644
--- a/lib/gui/epixmap.cpp
+++ b/lib/gui/epixmap.cpp
@@ -19,12 +19,24 @@ void ePixmap::setPixmap(gPixmap *pixmap)
 	event(evtChangedPixmap);
 }
 
+void ePixmap::setPixmap(ePtr<gPixmap> &pixmap)
+{
+	m_pixmap = pixmap;
+	event(evtChangedPixmap);
+}
+
 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);
 }