1 files changed, 5 insertions, 13 deletions
diff --git a/opentrack/selected-libraries.cpp b/opentrack/selected-libraries.cpp
index 63517774..e3bac0c5 100644
--- a/opentrack/selected-libraries.cpp
+++ b/opentrack/selected-libraries.cpp
@@ -1,33 +1,25 @@
 #include "opentrack/selected-libraries.hpp"
 #include <QDebug>
 
-SelectedLibraries::SelectedLibraries(QFrame* frame, dylibptr t, dylibptr p, dylibptr f) :
+SelectedLibraries::SelectedLibraries(QFrame* frame, mem<ITracker> t, dylibptr p, mem<IFilter> f) :
     pTracker(nullptr),
     pFilter(nullptr),
     pProtocol(nullptr),
     correct(false)
 {
+    pTracker = t;
     pProtocol = make_dylib_instance<IProtocol>(p);
+    pFilter = f;
 
-    if (!pProtocol)
+    if (!pTracker || !pProtocol)
     {
-        qDebug() << "protocol dylib load failure";
+        qDebug() << "dylib load failure";
         return;
     }
 
     if(!pProtocol->correct())
     {
         qDebug() << "protocol load failure";
-        pProtocol = nullptr;
-        return;
-    }
-
-    pTracker = make_dylib_instance<ITracker>(t);
-    pFilter = make_dylib_instance<IFilter>(f);
-
-    if (!pTracker)
-    {
-        qDebug() << "tracker dylib load failure";
         return;
     }