From 067f272da3701b6bf203e019fff4d1204e82e264 Mon Sep 17 00:00:00 2001
From: Tannin <devnull@localhost>
Date: Thu, 6 Jun 2013 20:19:38 +0200
Subject: - bugfix: archive file wasn't closed after installation - bugfix:
 batch installer was treated as handler for "manual" installations - bugfix:
 dropped include of unused sip interface

---
 src/installationmanager.cpp |  4 ++++
 src/nexusinterface.cpp      | 21 ---------------------
 2 files changed, 4 insertions(+), 21 deletions(-)

(limited to 'src')

diff --git a/src/installationmanager.cpp b/src/installationmanager.cpp
index 75ab11a3..744b928d 100644
--- a/src/installationmanager.cpp
+++ b/src/installationmanager.cpp
@@ -673,6 +673,10 @@ bool InstallationManager::install(const QString &fileName, GuessedValue<QString>
   bool archiveOpen = m_CurrentArchive->open(ToWString(QDir::toNativeSeparators(fileName)).c_str(),
                                             new MethodCallback<InstallationManager, void, LPSTR>(this, &InstallationManager::queryPassword));
 
+  ON_BLOCK_EXIT([this] {
+    this->m_CurrentArchive->close();
+  });
+
   DirectoryTree *filesTree = archiveOpen ? createFilesTree() : NULL;
 
   IPluginInstaller::EInstallResult installResult = IPluginInstaller::RESULT_NOTATTEMPTED;
diff --git a/src/nexusinterface.cpp b/src/nexusinterface.cpp
index f9deb569..2b03f5bf 100644
--- a/src/nexusinterface.cpp
+++ b/src/nexusinterface.cpp
@@ -45,7 +45,6 @@ void NexusBridge::requestDescription(int modID, QVariant userData)
 
 void NexusBridge::requestFiles(int modID, QVariant userData)
 {
-qDebug("request file %d", modID);
   m_RequestIDs.insert(m_Interface->requestFiles(modID, this, userData, m_Url));
 }
 
@@ -386,26 +385,6 @@ void NexusInterface::nextRequest()
     } break;
   }
 
-/*
-    /// <summary>
-    /// Finds the mods containing the given search terms.
-    /// </summary>
-    /// <param name="p_strModNameSearchString">The terms to use to search for mods.</param>
-    /// <param name="p_strType">Whether the returned mods' names should include all of
-    /// the given search terms, or any of the terms.</param>
-    /// <returns>The mod info for the mods matching the given search criteria.</returns>
-    [OperationContract]
-    [WebGet(
-      BodyStyle = WebMessageBodyStyle.Bare,
-      UriTemplate = "Mods/?Find&name={p_strModNameSearchString}&type={p_strType}",
-      ResponseFormat = WebMessageFormat.Json)]
-    List<NexusModInfo> FindMods(string p_strModNameSearchString, string p_strType);
-
-
-
-*/
-
-
   QNetworkRequest request(url);
   request.setHeader(QNetworkRequest::ContentTypeHeader, "application/xml");
 #pragma message("automatically insert the correct version number")
-- 
cgit v1.3.1