kindred/create
1
1
Fork 0
Code Issues 37 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity

fixes 0003913: libspnav crash on linux wayland during startup

Browse Source
This commit is contained in:
wmayer
2019-04-05 17:42:53 +02:00
parent 3be97dd9e2
commit 732eb6dbb5
1 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/Gui/3Dconnexion/GuiNativeEventLinuxX11.cpp
View File

@@ -66,15 +66,21 @@ Gui::GuiNativeEvent::~GuiNativeEvent()
void Gui::GuiNativeEvent::initSpaceball(QMainWindow *window)
{
#if QT_VERSION >= 0x050200
if (!QX11Info::isPlatformX11()) {
Base::Console().Log("Application is not running on X11\n");
return;
}
#endif
if (spnav_x11_open(QX11Info::display(), window->winId()) == -1) {
Base::Console().Log("Couldn't connect to spacenav daemon\n");
} else {
Base::Console().Log("Connected to spacenav daemon\n");
mainApp->setSpaceballPresent(true);
mainApp->setSpaceballPresent(true);
#if QT_VERSION >= 0x050000
#if QT_VERSION >= 0x050000
mainApp->installNativeEventFilter(new Gui::RawInputEventFilter(&xcbEventFilter));
#endif // #if QT_VERSION >= 0x050000
#endif // #if QT_VERSION >= 0x050000
}
}