aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorghost <andreas.monzner@multimedia-labs.de>2009-07-17 12:37:07 +0200
committerghost <andreas.monzner@multimedia-labs.de>2009-07-17 12:37:07 +0200
commit4058ce38d580cd8693fecf3e62132fadc5e5e975 (patch)
treee9d23298804000a1c6d658df6973f5fc361deeed
parenta23ed7f5a165951c6042411b0d0cabaab010f561 (diff)
parent767c0c99050c9ba714841d556065653011a3bc68 (diff)
downloadenigma2-4058ce38d580cd8693fecf3e62132fadc5e5e975.tar.gz
enigma2-4058ce38d580cd8693fecf3e62132fadc5e5e975.zip
Merge branch 'master' of git.opendreambox.org:/git/enigma2
-rw-r--r--lib/gui/esubtitle.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/gui/esubtitle.cpp b/lib/gui/esubtitle.cpp
index 5cf4cfa2..41adebdb 100644
--- 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);
}