From 765a6676e04b19a9af298096f9d4f0a6e571ccbd Mon Sep 17 00:00:00 2001
From: Anders Bakken <anders.bakken@nokia.com>
Date: Wed, 1 Jul 2009 16:11:50 -0700
Subject: Make sure we check the right device

Also. Make sure to call QRasterPaintEngine::end()

Reviewed-by: Donald <qt-info@nokia.com>
---
 src/plugins/gfxdrivers/directfb/qdirectfbpaintengine.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/plugins/gfxdrivers/directfb/qdirectfbpaintengine.cpp b/src/plugins/gfxdrivers/directfb/qdirectfbpaintengine.cpp
index bac9f09..e4ce230 100644
--- a/src/plugins/gfxdrivers/directfb/qdirectfbpaintengine.cpp
+++ b/src/plugins/gfxdrivers/directfb/qdirectfbpaintengine.cpp
@@ -299,7 +299,7 @@ bool QDirectFBPaintEngine::begin(QPaintDevice *device)
     d->lastLockedHeight = -1;
     if (device->devType() == QInternal::CustomRaster) {
         d->dfbDevice = static_cast<QDirectFBPaintDevice*>(device);
-    } else if (d->device->devType() == QInternal::Pixmap) {
+    } else if (device->devType() == QInternal::Pixmap) {
         QPixmapData *data = static_cast<QPixmap*>(device)->pixmapData();
         Q_ASSERT(data->classId() == QPixmapData::DirectFBClass);
         QDirectFBPixmapData *dfbPixmapData = static_cast<QDirectFBPixmapData*>(data);
@@ -342,7 +342,7 @@ bool QDirectFBPaintEngine::end()
 #endif
     d->surface->SetClip(d->surface, NULL);
     d->surface = 0;
-    return true;
+    return QRasterPaintEngine::end();
 }
 
 void QDirectFBPaintEngine::clipEnabledChanged()
-- 
cgit v0.12