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

Properly disconnect the test xcb connection

Browse source 
So far it only got disconnected in the multi-head situation.

REVIEW: 122218
This commit is contained in:
Martin Gräßlin 2015-01-23 09:54:03 +01:00
parent 52793c5e5b
commit 1e41e3e674
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
main_x11.cpp
View file

@ -198,6 +198,8 @@ KWIN_EXPORT int kdemain(int argc, char * argv[])
}
const int number_of_screens = xcb_setup_roots_length(xcb_get_setup(c));
xcb_disconnect(c);
c = nullptr;
// multi head
auto isMultiHead = []() -> bool {
@ -212,8 +214,6 @@ KWIN_EXPORT int kdemain(int argc, char * argv[])
KWin::Application::setX11ScreenNumber(primaryScreen);
int pos; // Temporarily needed to reconstruct DISPLAY var if multi-head
QByteArray display_name = qgetenv("DISPLAY");
xcb_disconnect(c);
c = nullptr;
if ((pos = display_name.lastIndexOf('.')) != -1)
display_name.remove(pos, 10); // 10 is enough to be sure we removed ".s"