Merge branch 'master' of git.opendreambox.org:/git/enigma2

diff --git a/lib/gui/esubtitle.cpp b/lib/gui/esubtitle.cpp
index 5cf4cfa2b6d9c403712845ea83a22cb471bccddb..41adebdb8626443af1a8038cbcfdf84e81bd948d 100644 (file)
--- a/lib/gui/esubtitle.cpp
+++ b/lib/gui/esubtitle.cpp
@@ -121,7 +121,8 @@ void eSubtitleWidget::setPixmap(ePtr<gPixmap> &pixmap, gRegion changed, eRect pi
        changed.scale(m_pixmap_dest.width(), 720, m_pixmap_dest.height(), 576);
        changed.moveBy(ePoint(m_pixmap_dest.x(), m_pixmap_dest.y()));
 
-       changed.scale(size().width(), pixmap->size().width(), size().height(), pixmap->size().height());
+       if (pixmap->size().width() && pixmap->size().height())
+               changed.scale(size().width(), pixmap->size().width(), size().height(), pixmap->size().height());
        
        invalidate(changed);
 }