Fix incorrect patch merge.

svn path=/trunk/KDE/kdebase/workspace/; revision=660358
18 years ago · a7c2ac4542
parent 7a0f50b298
commit a7c2ac4542
1 changed files with 1 additions and 1 deletions
--- 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