~ubuntu-branches/ubuntu/precise/kde-workspace/precise-security

« back to all changes in this revision

Viewing changes to kwin/manage.cpp

Tags: upstream-4.7.2
Import upstream version 4.7.2

Show diffs side-by-side

added added

removed removed

Lines of Context:
316
316
    if (!noBorder()) {
317
317
        client_group = NULL;
318
318
        // Automatically add to previous groups on session restore
319
 
        if (session && session->clientGroupClient && session->clientGroupClient != this)
 
319
        if (session && session->clientGroupClient && session->clientGroupClient != this && session->clientGroupClient->clientGroup())
320
320
            session->clientGroupClient->clientGroup()->add(this, -1, true);
321
321
        else if (isMapped)
322
322
            // If the window is already mapped (Restarted KWin) add any windows that already have the