Forward port rev 1140341: Ensure that a decoration is created before we try to shade the client. This fixes a crash when auto-grouping is enabled and a client should be added to a shaded group.

It still crashes when kwin is restarted with a shade group (same backtrace, but needs a different fix).
CCBUG: 242206

svn path=/trunk/KDE/kdebase/workspace/; revision=1140342
This commit is contained in:
Martin Gräßlin 2010-06-20 12:16:28 +00:00
parent 36744df4c1
commit c9658fa34a

View file

@ -321,6 +321,8 @@ bool Client::manage( Window w, bool isMapped )
const Client* similar = workspace()->findSimilarClient( this ); const Client* similar = workspace()->findSimilarClient( this );
if( similar && similar->clientGroup() && !similar->noBorder() ) if( similar && similar->clientGroup() && !similar->noBorder() )
{ {
geom = QRect( similar->pos() + similar->clientPos(), similar->clientSize() );
updateDecoration( false );
similar->clientGroup()->add( this, -1, similar->clientGroup()->add( this, -1,
rules()->checkAutogroupInForeground( options->autogroupInForeground )); rules()->checkAutogroupInForeground( options->autogroupInForeground ));
// Don't move entire group // Don't move entire group