Merging from old trunk:
r619874 | lunakl | 2007-01-04 18:03:04 +0100 (Thu, 04 Jan 2007) | 4 lines Properly add a window to a group. (BUG: 139180) svn path=/trunk/KDE/kdebase/workspace/; revision=659521
This commit is contained in:
parent
047ad1b80a
commit
ce110c887f
1 changed files with 4 additions and 3 deletions
|
@ -1001,10 +1001,11 @@ void Client::checkGroup( Group* set_group, bool force )
|
|||
in_group->removeMember( this );
|
||||
in_group = NULL;
|
||||
}
|
||||
in_group = new_group;
|
||||
if( in_group == NULL )
|
||||
if( new_group == NULL )
|
||||
new_group = new Group( None, workspace() );
|
||||
if( in_group != new_group )
|
||||
{
|
||||
in_group = new Group( None, workspace());
|
||||
in_group = new_group;
|
||||
in_group->addMember( this );
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue