yukijoou/kwin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Add nullptr check in AbstractClient::checkWorkspacePosition for workspace()

Browse source 
If a decorated ShellClient is still around after Workspace got destroyed
this method is still invoked and can lead to a crash. As we have a
workspace initing test there already it makes sense to combine it with
a workspace being down check.
This commit is contained in:
Martin Gräßlin 2016-02-04 11:16:55 +01:00
parent 7558fcd4b4
commit 4c7450a1f6
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
geometry.cpp
View file

@ -1075,7 +1075,7 @@ void AbstractClient::checkWorkspacePosition(QRect oldGeometry, int oldDesktop, Q
// because the window already had its position, and if a window
// with a strut altering the workarea would be managed in initialization
// after this one, this window would be moved
if (workspace()->initializing())
if (!workspace() || workspace()->initializing())
return;
// If the window was touching an edge before but not now move it so it is again.