Mirrors/overte-lubosz
3
0
Fork 0
mirror of https://github.com/lubosz/overte.git synced 2025-08-05 12:24:39 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #3509 from birarda/hydra-crash

Browse source 
have OS X hydra support be disabled by default
This commit is contained in:
Stephen Birarda 2014-09-29 17:29:09 -07:00
commit a2d263f978
2 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
interface/src/Menu.cpp
View file

@ -434,7 +434,7 @@ Menu::Menu() :
#ifdef __APPLE__ #ifdef __APPLE__
addCheckableActionToQMenuAndActionHash(sixenseOptionsMenu, addCheckableActionToQMenuAndActionHash(sixenseOptionsMenu,
MenuOption::SixenseEnabled, MenuOption::SixenseEnabled,
0, true, 0, false,
this, this,
SLOT(toggleSixense(bool))); SLOT(toggleSixense(bool)));
#endif #endif

2
interface/src/devices/SixenseManager.cpp
View file

@ -100,6 +100,8 @@ void SixenseManager::initialize() {
_sixenseLibrary = new QLibrary(SIXENSE_LIBRARY_NAME); _sixenseLibrary = new QLibrary(SIXENSE_LIBRARY_NAME);
} }
qDebug() << "Initializing sixense library for hydra support - libsixense_x64.dylib load state is"
<< _sixenseLibrary->isLoaded();
SixenseBaseFunction sixenseInit = (SixenseBaseFunction) _sixenseLibrary->resolve("sixenseInit"); SixenseBaseFunction sixenseInit = (SixenseBaseFunction) _sixenseLibrary->resolve("sixenseInit");
#endif #endif