Skip to content

Commit

Permalink
Merge pull request #4464 from luzpaz/spacemouse-warning
Browse files Browse the repository at this point in the history
3Dconnexion: Clarify ambivalent console output warning [skip ci]
  • Loading branch information
yorikvanhavre committed Feb 16, 2021
2 parents a62b5b3 + 0d89598 commit bb00993
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion src/Gui/3Dconnexion/GuiNativeEventLinux.cpp
Expand Up @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion src/Gui/3Dconnexion/GuiNativeEventLinuxX11.cpp
Expand Up @@ -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);
Expand Down

0 comments on commit bb00993

Please sign in to comment.