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

Check whether it's platform xcb before calling QX11Info::display()

Browse source 
Internally QX11Info::display() calls into QPA native interface and
tries to resolve the nativeResourceForIntegration for "display".
Unfortunately this key also exists in other QPA plugins, e.g. in
QtWayland.

Calling without a check on platform results on wayland qpa in
wl_display* being casted into Display*.

REVIEW: 124203
This commit is contained in:
Nerdopolis Turfwalker 2015-06-29 13:56:38 +02:00 committed by Martin Gräßlin
parent 4c03115882
commit 924b66c4d5
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
libkwineffects/kwinglobals.h
View file

@ -131,7 +131,7 @@ inline
KWIN_EXPORT Display* display() KWIN_EXPORT Display* display()
{ {
static Display *s_display = nullptr; static Display *s_display = nullptr;
if (!s_display) { if (!s_display && QX11Info::isPlatformX11()) {
s_display = QX11Info::display(); s_display = QX11Info::display();
} }
return s_display; return s_display;