Commit d62db381 authored by Thomas Lübking's avatar Thomas Lübking
Browse files

don't try to raise unmapped input windows

or screenedges over unmapped
causes race with kscreenlocker

BUG: 303579
REVIEW: 105585
FIXED-IN: 4.10
parent 42678c60
......@@ -1077,13 +1077,16 @@ void EffectsHandlerImpl::checkInputWindowStacking()
if (XGetWindowAttributes(display(), it.second, &attr) && attr.map_state != IsUnmapped)
wins[pos++] = it.second;
}
XRaiseWindow(display(), wins[0]);
XRestackWindows(display(), wins, pos);
if (pos) {
XRaiseWindow(display(), wins[0]);
XRestackWindows(display(), wins, pos);
}
delete[] wins;
// Raise electric border windows above the input windows
// so they can still be triggered. TODO: Do both at once.
#ifdef KWIN_BUILD_SCREENEDGES
Workspace::self()->screenEdge()->ensureOnTop();
if (pos)
Workspace::self()->screenEdge()->ensureOnTop();
#endif
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment