From ef427d48fa684578ecb69e4e1ce2072f12362682 Mon Sep 17 00:00:00 2001
From: Gunnar Sletta <gunnar@trolltech.com>
Date: Fri, 22 Jan 2010 14:47:15 +0100
Subject: Fix QPainter::redirection() to pass autotest.

Reviewed-by: Trond
---
 src/gui/painting/qpainter.cpp | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/gui/painting/qpainter.cpp b/src/gui/painting/qpainter.cpp
index 1258d6b..cde6a2d 100644
--- a/src/gui/painting/qpainter.cpp
+++ b/src/gui/painting/qpainter.cpp
@@ -7503,15 +7503,14 @@ QPaintDevice *QPainter::redirected(const QPaintDevice *device, QPoint *offset)
 {
     Q_ASSERT(device != 0);
 
-    if (*globalRedirectionAtomic() == 0)
-        return 0;
-
     if (device->devType() == QInternal::Widget) {
         const QWidgetPrivate *widgetPrivate = static_cast<const QWidget *>(device)->d_func();
         if (widgetPrivate->redirectDev)
             return widgetPrivate->redirected(offset);
     }
 
+    if (*globalRedirectionAtomic() == 0)
+        return 0;
 
     QMutexLocker locker(globalRedirectionsMutex());
     QPaintDeviceRedirectionList *redirections = globalRedirections();
-- 
cgit v0.12