diff options
| author | Trond Kjernåsen <trond@trolltech.com> | 2009-11-26 14:47:49 (GMT) |
|---|---|---|
| committer | Trond Kjernåsen <trond@trolltech.com> | 2009-11-26 14:47:49 (GMT) |
| commit | ee0690cdf553b6cf22432488ea113209203fe1ce (patch) | |
| tree | 6b4a1f345d7643f17b6eed5a6e5d18fd9394e711 | |
| parent | a8daa8fc4e8a7508634a48c749ad574ab2f85772 (diff) | |
| download | Qt-ee0690cdf553b6cf22432488ea113209203fe1ce.zip Qt-ee0690cdf553b6cf22432488ea113209203fe1ce.tar.gz Qt-ee0690cdf553b6cf22432488ea113209203fe1ce.tar.bz2 | |
Fixed a crash in the GL engine when trying to draw invalid pixmaps.
Task-number: QTBUG-6226
Reviewed-by: Eskil
| -rw-r--r-- | src/gui/painting/qpainter.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/painting/qpainter.cpp b/src/gui/painting/qpainter.cpp index 97f3dd4..d048d51 100644 --- a/src/gui/painting/qpainter.cpp +++ b/src/gui/painting/qpainter.cpp @@ -5182,7 +5182,7 @@ void QPainter::drawPixmap(const QPointF &p, const QPixmap &pm) Q_D(QPainter); - if (!d->engine) + if (!d->engine || pm.isNull()) return; #ifndef QT_NO_DEBUG |