1 files changed, 12 insertions, 11 deletions
diff --git a/src/nexusinterface.cpp b/src/nexusinterface.cpp
index d844cd39..30221f4b 100644
--- a/src/nexusinterface.cpp
+++ b/src/nexusinterface.cpp
@@ -145,30 +145,25 @@ QAtomicInt NexusInterface::NXMRequestInfo::s_NextID(0);
 NexusInterface::NexusInterface()
   : m_NMMVersion()
 {
-  atexit(&cleanup);
-
   VS_FIXEDFILEINFO version = GetFileVersion(ToWString(QApplication::applicationFilePath()));
   m_MOVersion = VersionInfo(version.dwFileVersionMS >> 16,
                             version.dwFileVersionMS & 0xFFFF,
                             version.dwFileVersionLS >> 16);
 
   m_AccessManager = new NXMAccessManager(this, m_MOVersion.displayString());
-
   m_DiskCache = new QNetworkDiskCache(this);
   connect(m_AccessManager, SIGNAL(requestNXMDownload(QString)), this, SLOT(downloadRequestedNXM(QString)));
 }
 
-
-void NexusInterface::cleanup()
-{
-}
-
-
 NXMAccessManager *NexusInterface::getAccessManager()
 {
   return m_AccessManager;
 }
 
+NexusInterface::~NexusInterface()
+{
+  cleanup();
+}
 
 NexusInterface *NexusInterface::instance()
 {
@@ -176,14 +171,12 @@ NexusInterface *NexusInterface::instance()
   return &s_Instance;
 }
 
-
 void NexusInterface::setCacheDirectory(const QString &directory)
 {
   m_DiskCache->setCacheDirectory(directory);
   m_AccessManager->setCache(m_DiskCache);
 }
 
-
 void NexusInterface::setNMMVersion(const QString &nmmVersion)
 {
   m_NMMVersion = nmmVersion;
@@ -378,6 +371,14 @@ bool NexusInterface::requiresLogin(const NXMRequestInfo &info)
       || (info.m_Type == NXMRequestInfo::TYPE_DOWNLOADURL);
 }
 
+void NexusInterface::cleanup()
+{
+//  delete m_AccessManager;
+//  delete m_DiskCache;
+  m_AccessManager = nullptr;
+  m_DiskCache = nullptr;
+}
+
 void NexusInterface::nextRequest()
 {
   if ((m_ActiveRequest.size() >= MAX_ACTIVE_DOWNLOADS)