From a7c2ac45420a0da08a3257d9f01d582ffe462087 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lubo=C5=A1=20Lu=C5=88=C3=A1k?= <l.lunak@kde.org>
Date: Wed, 2 May 2007 12:50:37 +0000
Subject: [PATCH] Fix incorrect patch merge.

svn path=/trunk/KDE/kdebase/workspace/; revision=660358
---
 client.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client.cpp b/client.cpp
index 20a0e873c5..d692e45950 100644
--- a/client.cpp
+++ b/client.cpp
@@ -517,7 +517,6 @@ void Client::updateShape()
         noborder = true;
         updateDecoration( true );
         }
-    updateShape();
     }
 
 void Client::setMask( const QRegion& reg, int mode )
@@ -552,6 +551,7 @@ void Client::setMask( const QRegion& reg, int mode )
         scene->windowGeometryShapeChanged( this );
     if( effects != NULL )
         static_cast<EffectsHandlerImpl*>(effects)->windowGeometryShapeChanged( effectWindow(), geometry());
+    updateShape();
     }
 
 QRegion Client::mask() const