diff options
| -rw-r--r-- | facetracknoir/main.cpp | 10 | ||||
| -rw-r--r-- | opentrack/options.hpp | 1 |
2 files changed, 9 insertions, 2 deletions
diff --git a/facetracknoir/main.cpp b/facetracknoir/main.cpp index aa33522d..7fb37864 100644 --- a/facetracknoir/main.cpp +++ b/facetracknoir/main.cpp @@ -4,6 +4,10 @@ #include <QStringList> #include <memory> +#ifndef _WIN32 +# include <unistd.h> +#endif + int main(int argc, char** argv) { // workaround QTBUG-38598 @@ -32,6 +36,10 @@ int main(int argc, char** argv) w->show(); app.exec(); - + +#ifndef _WIN32 + _exit(0); +#endif + return 0; } diff --git a/opentrack/options.hpp b/opentrack/options.hpp index d81f4888..6c15d729 100644 --- a/opentrack/options.hpp +++ b/opentrack/options.hpp @@ -213,7 +213,6 @@ namespace options { static opt_singleton<k, v>& datum() { - // XXX crashes with dlopen on Linux -sh 20141019 static auto ret = std::make_shared<opt_singleton<k, v>>(); return *ret; } |