Merge pull request #26 from Shatur95/master

Fix crash on Wayland
This commit is contained in:
Felix Barz
2019-11-06 10:17:01 +01:00
committed by GitHub
+1 -2
View File
@@ -99,8 +99,7 @@ quint32 QHotkeyPrivateX11::nativeKeycode(Qt::Key keycode, bool &ok)
return 0; return 0;
} }
Display *display = QX11Info::display(); if(QX11Info::isPlatformX11()) {
if(display) {
auto res = XKeysymToKeycode(QX11Info::display(), keysym); auto res = XKeysymToKeycode(QX11Info::display(), keysym);
if(res != 0) if(res != 0)
ok = true; ok = true;