Merge branch 'unstable' into trackhat-ui

4 files changed, 23 insertions, 6 deletions

diff --git a/opentrack/selected-libraries.cpp b/opentrack/selected-libraries.cpp
index 630b7db2..e3bac0c5 100644
--- a/opentrack/selected-libraries.cpp
+++ b/opentrack/selected-libraries.cpp
@@ -1,10 +1,6 @@
 #include "opentrack/selected-libraries.hpp"
 #include <QDebug>
 
-SelectedLibraries::~SelectedLibraries()
-{
-}
-
 SelectedLibraries::SelectedLibraries(QFrame* frame, mem<ITracker> t, dylibptr p, mem<IFilter> f) :
     pTracker(nullptr),
     pFilter(nullptr),
diff --git a/opentrack/selected-libraries.hpp b/opentrack/selected-libraries.hpp
index 547f5f54..7779c231 100644
--- a/opentrack/selected-libraries.hpp
+++ b/opentrack/selected-libraries.hpp
@@ -18,6 +18,5 @@ struct SelectedLibraries {
     mem<IProtocol> pProtocol;
     SelectedLibraries(QFrame* frame, mem<ITracker> t, dylibptr p, mem<IFilter> f);
     SelectedLibraries() : pTracker(nullptr), pFilter(nullptr), pProtocol(nullptr), correct(false) {}
-    ~SelectedLibraries();
     bool correct;
 };
diff --git a/opentrack/sleep.hpp b/opentrack/sleep.hpp
new file mode 100644
index 00000000..27920842
--- /dev/null
+++ b/opentrack/sleep.hpp
@@ -0,0 +1,22 @@
+#pragma once
+
+namespace portable
+{
+#ifdef _WIN32
+    #include <windows.h>
+
+    template<typename = void>
+    void sleep(unsigned milliseconds)
+    {
+        Sleep(milliseconds);
+    }
+#else
+    #include <unistd.h>
+
+    template<typename = void>
+    void sleep(unsigned milliseconds)
+    {
+        usleep(milliseconds * 1000U); // takes microseconds
+    }
+#endif
+}
diff --git a/opentrack/work.hpp b/opentrack/work.hpp
index 39eb12fb..5d1f6b54 100644
--- a/opentrack/work.hpp
+++ b/opentrack/work.hpp
@@ -20,7 +20,7 @@
 struct Work
 {
     main_settings& s;
-    SelectedLibraries libs;
+    SelectedLibraries& libs;
     mem<Tracker> tracker;
     mem<Shortcuts> sc;
     WId handle;