From 68a72b0f4161ea565bbd5f2a4d19efb74aecfbcd Mon Sep 17 00:00:00 2001 From: Atlante45 Date: Fri, 6 Nov 2015 17:22:12 -0800 Subject: [PATCH] Bit of cleanup --- .../src/input-plugins/SixenseSupportOSX.cpp | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/libraries/input-plugins/src/input-plugins/SixenseSupportOSX.cpp b/libraries/input-plugins/src/input-plugins/SixenseSupportOSX.cpp index 378c99de76..f6cec5d67f 100644 --- a/libraries/input-plugins/src/input-plugins/SixenseSupportOSX.cpp +++ b/libraries/input-plugins/src/input-plugins/SixenseSupportOSX.cpp @@ -20,6 +20,10 @@ #include "InputPluginsLogging.h" +#ifndef SIXENSE_LIB_FILENAME +#define SIXENSE_LIB_FILENAME QCoreApplication::applicationDirPath() + "/../Frameworks/libsixense_x64" +#endif + using Library = std::unique_ptr; static Library SIXENSE; @@ -41,15 +45,9 @@ Callable resolve(const Library& library, const char* name) { void loadSixense() { - if (!SIXENSE) { - static const QString LIBRARY_PATH = -#ifdef SIXENSE_LIB_FILENAME - SIXENSE_LIB_FILENAME; -#else - QCoreApplication::applicationDirPath() + "/../Frameworks/libsixense_x64"; -#endif - SIXENSE.reset(new QLibrary(LIBRARY_PATH)); - } + Q_ASSERT_X(!(SIXENSE && SIXENSE->isLoaded()), __FUNCTION__, "Sixense library already loaded"); + SIXENSE.reset(new QLibrary(SIXENSE_LIB_FILENAME)); + Q_CHECK_PTR(SIXENSE); if (SIXENSE->load()){ qDebug() << "Loaded sixense library for hydra support -" << SIXENSE->fileName();