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

Merge pull request #4464 from luzpaz/spacemouse-warning

Browse Source 
3Dconnexion: Clarify ambivalent console output warning [skip ci]
This commit is contained in:
Yorik van Havre
2021-02-16 16:25:46 +01:00
committed by GitHub
parent 3c1d251014 cc0f72953f
commit 039faa7aeb
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Gui/3Dconnexion/GuiNativeEventLinux.cpp
View File

@@ -49,7 +49,7 @@ void Gui::GuiNativeEvent::initSpaceball(QMainWindow *window)
{
Q_UNUSED(window)
if (spnav_open() == -1) {
Base::Console().Log("Couldn't connect to spacenav daemon\n");
Base::Console().Log("Couldn't connect to spacenav daemon. Please ignore if you don't have a spacemouse.\n");
} else {
Base::Console().Log("Connected to spacenav daemon\n");
QSocketNotifier* SpacenavNotifier = new QSocketNotifier(spnav_fd(), QSocketNotifier::Read, this);

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

@@ -73,7 +73,7 @@ void Gui::GuiNativeEvent::initSpaceball(QMainWindow *window)
}
#endif
if (spnav_x11_open(QX11Info::display(), window->winId()) == -1) {
Base::Console().Log("Couldn't connect to spacenav daemon on X11\n");
Base::Console().Log("Couldn't connect to spacenav daemon on X11. Please ignore if you don't have a spacemouse.\n");
} else {
Base::Console().Log("Connected to spacenav daemon on X11\n");
mainApp->setSpaceballPresent(true);