From 78f628e0af2f2df562c40ac1424b432b6a969055 Mon Sep 17 00:00:00 2001
From: Tannin <devnull@localhost>
Date: Fri, 28 Nov 2014 11:06:28 +0100
Subject: cleanup und bugfixes after refactoring

---
 src/nexusinterface.cpp | 20 +++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

(limited to 'src/nexusinterface.cpp')

diff --git a/src/nexusinterface.cpp b/src/nexusinterface.cpp
index b4006097..d68fe8fe 100644
--- a/src/nexusinterface.cpp
+++ b/src/nexusinterface.cpp
@@ -34,35 +34,34 @@ using namespace MOShared;
 
 NexusBridge::NexusBridge(const QString &subModule)
   : m_Interface(NexusInterface::instance())
-  , m_Url(MOBase::ToQString(MOShared::GameInfo::instance().getNexusInfoUrl()))
+  , m_Url() // lazy initialized
   , m_SubModule(subModule)
 {
 }
 
-
 void NexusBridge::requestDescription(int modID, QVariant userData)
 {
-  m_RequestIDs.insert(m_Interface->requestDescription(modID, this, userData, m_SubModule, m_Url));
+  m_RequestIDs.insert(m_Interface->requestDescription(modID, this, userData, m_SubModule, url()));
 }
 
 void NexusBridge::requestFiles(int modID, QVariant userData)
 {
-  m_RequestIDs.insert(m_Interface->requestFiles(modID, this, userData, m_SubModule, m_Url));
+  m_RequestIDs.insert(m_Interface->requestFiles(modID, this, userData, m_SubModule, url()));
 }
 
 void NexusBridge::requestFileInfo(int modID, int fileID, QVariant userData)
 {
-  m_RequestIDs.insert(m_Interface->requestFileInfo(modID, fileID, this, userData, m_SubModule, m_Url));
+  m_RequestIDs.insert(m_Interface->requestFileInfo(modID, fileID, this, userData, m_SubModule, url()));
 }
 
 void NexusBridge::requestDownloadURL(int modID, int fileID, QVariant userData)
 {
-  m_RequestIDs.insert(m_Interface->requestDownloadURL(modID, fileID, this, userData, m_SubModule, m_Url));
+  m_RequestIDs.insert(m_Interface->requestDownloadURL(modID, fileID, this, userData, m_SubModule, url()));
 }
 
 void NexusBridge::requestToggleEndorsement(int modID, bool endorse, QVariant userData)
 {
-  m_RequestIDs.insert(m_Interface->requestToggleEndorsement(modID, endorse, this, userData, m_SubModule, m_Url));
+  m_RequestIDs.insert(m_Interface->requestToggleEndorsement(modID, endorse, this, userData, m_SubModule, url()));
 }
 
 void NexusBridge::nxmDescriptionAvailable(int modID, QVariant userData, QVariant resultData, int requestID)
@@ -138,6 +137,13 @@ void NexusBridge::nxmRequestFailed(int modID, int fileID, QVariant userData, int
   }
 }
 
+QString NexusBridge::url() {
+  if (m_Url.isEmpty()) {
+    m_Url = MOBase::ToQString(MOShared::GameInfo::instance().getNexusInfoUrl());
+  }
+  return m_Url;
+}
+
 
 QAtomicInt NexusInterface::NXMRequestInfo::s_NextID(0);
 
-- 
cgit v1.3.1