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

Don't crash on tear-down of Workspace if run without X11 support

Browse source 
Much easier than expected.
This commit is contained in:
Martin Flöser 2017-09-30 13:31:14 +02:00
parent 8ae37c420b
commit 0c8c047d78
2 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
netinfo.cpp
View file

@ -129,7 +129,9 @@ RootInfo *RootInfo::create()
void RootInfo::destroy()
{
Q_ASSERT(s_self);
if (!s_self) {
return;
}
xcb_window_t supportWindow = s_self->supportWindow();
delete s_self;
s_self = NULL;

5
workspace.cpp
View file

@ -512,7 +512,10 @@ Workspace::~Workspace()
Client::cleanupX11();
for (UnmanagedList::iterator it = unmanaged.begin(), end = unmanaged.end(); it != end; ++it)
(*it)->release(ReleaseReason::KWinShutsDown);
xcb_delete_property(connection(), rootWindow(), atoms->kwin_running);
if (auto c = kwinApp()->x11Connection()) {
xcb_delete_property(c, kwinApp()->x11RootWindow(), atoms->kwin_running);
}
for (auto it = deleted.begin(); it != deleted.end();) {
emit deletedRemoved(*it);