1 files changed, 10 insertions, 5 deletions
diff --git a/src/plugins/gfxdrivers/directfb/qdirectfbwindowsurface.cpp b/src/plugins/gfxdrivers/directfb/qdirectfbwindowsurface.cpp
index ff9f7bd..4cebc96 100644
--- a/src/plugins/gfxdrivers/directfb/qdirectfbwindowsurface.cpp
+++ b/src/plugins/gfxdrivers/directfb/qdirectfbwindowsurface.cpp
@@ -113,13 +113,17 @@ bool QDirectFBWindowSurface::isValid() const
 #ifdef QT_DIRECTFB_WM
 void QDirectFBWindowSurface::raise()
 {
-    if (dfbWindow) {
-        dfbWindow->RaiseToTop(dfbWindow);
-    } else if (sibling && (!sibling->sibling || sibling->dfbWindow)) {
-        sibling->raise();
+    if (IDirectFBWindow *window = directFBWindow()) {
+        window->RaiseToTop(window);
     }
 }
 
+IDirectFBWindow *QDirectFBWindowSurface::directFBWindow() const
+{
+    return (dfbWindow ? dfbWindow : (sibling ? sibling->dfbWindow : 0));
+}
+
+
 void QDirectFBWindowSurface::createWindow(const QRect &rect)
 {
     IDirectFBDisplayLayer *layer = screen->dfbDisplayLayer();
@@ -411,7 +415,8 @@ IDirectFBSurface *QDirectFBWindowSurface::surfaceForWidget(const QWidget *widget
             *rect = QRect(widget->mapTo(win, QPoint(0, 0)), widget->size());
         }
     }
-    Q_ASSERT(win == widget || widget->isAncestorOf(win));
+
+    Q_ASSERT(win == widget || win->isAncestorOf(widget));
     return dfbSurface;
 }