2 files changed, 7 insertions, 8 deletions
diff --git a/network/network.cpp b/network/network.cpp
index 2472279..46045dc 100644
--- a/network/network.cpp
+++ b/network/network.cpp
@@ -22,27 +22,26 @@
 #include "responsemessage.h"
 #include "messagefactory.h"
 #include "messageengine.h"
+#include "messageenginefactory.h"
 #include "networkadapter.h"
 #include "network.h"
 
 
 Network::Network (QUrl &url, QQmlContext *context, QObject * parent) :
-    QObject(parent),
-    m_mloop(nullptr)
+    QObject(parent)
 {
-    m_mloop = new MessageEngine(url);
+    m_mloop = MessageEngineFactory::getInstance().getMessageEngine(url);
     m_adapters.append(new WifiAdapter(this, context, parent));
 
-    QObject::connect(m_mloop, &MessageEngine::connected, this, &Network::onConnected);
-    QObject::connect(m_mloop, &MessageEngine::disconnected, this, &Network::onDisconnected);
-    QObject::connect(m_mloop, &MessageEngine::messageReceived, this, &Network::onMessageReceived);
+    QObject::connect(m_mloop.get(), &MessageEngine::connected, this, &Network::onConnected);
+    QObject::connect(m_mloop.get(), &MessageEngine::disconnected, this, &Network::onDisconnected);
+    QObject::connect(m_mloop.get(), &MessageEngine::messageReceived, this, &Network::onMessageReceived);
 
     m_adapters.append(new WiredAdapter(this, context, parent));
 }
 
 Network::~Network()
 {
-    delete m_mloop;
     while (!m_adapters.isEmpty())
         m_adapters.takeLast();
 }
diff --git a/network/network.h b/network/network.h
index b40b432..07ff54d 100644
--- a/network/network.h
+++ b/network/network.h
@@ -54,7 +54,7 @@ class Network : public QObject
         void searchResults(QString name);
 
     private:
-        MessageEngine *m_mloop;
+        std::shared_ptr<MessageEngine> m_mloop;
         QQmlContext *m_context;
         QList<AdapterIf*> m_adapters;