From 14b164a03d60615f67a0e0cb97a7fe93c36f2fcd Mon Sep 17 00:00:00 2001
From: pvdk <pvdkloet@gmail.com>
Date: Sun, 30 Mar 2014 23:11:38 +0200
Subject: [PATCH] Reverted an unneeded fix

---
 apps/wizard/unshield/unshieldworker.cpp | 32 +++++++------------------
 apps/wizard/unshield/unshieldworker.hpp |  3 +--
 2 files changed, 9 insertions(+), 26 deletions(-)

diff --git a/apps/wizard/unshield/unshieldworker.cpp b/apps/wizard/unshield/unshieldworker.cpp
index f0b9a8674..81282f547 100644
--- a/apps/wizard/unshield/unshieldworker.cpp
+++ b/apps/wizard/unshield/unshieldworker.cpp
@@ -389,7 +389,7 @@ void Wizard::UnshieldWorker::extract()
 
     // Write the settings to the Morrowind config file
     if (!writeSettings())
-        return false;
+        return;
 
     // Remove the temporary directory
     removeDirectory(getPath() + QDir::separator() + QLatin1String("extract-temp"));
@@ -453,18 +453,11 @@ bool Wizard::UnshieldWorker::setupComponent(Component component)
 
             qDebug() << "current archive: " << file;
 
-            // Try to open the archive
-            Unshield *unshield = NULL;
-            unshield = openCab(file);
-
-            if (!unshield)
-                return false;
-
             if (component == Wizard::Component_Morrowind)
             {
-                bool morrowindFound = findInCab(QLatin1String("Morrowind.bsa"), unshield);
-                bool tribunalFound = findInCab(QLatin1String("Tribunal.bsa"), unshield);
-                bool bloodmoonFound = findInCab(QLatin1String("Bloodmoon.bsa"), unshield);
+                bool morrowindFound = findInCab(QLatin1String("Morrowind.bsa"), file);
+                bool tribunalFound = findInCab(QLatin1String("Tribunal.bsa"), file);
+                bool bloodmoonFound = findInCab(QLatin1String("Bloodmoon.bsa"), file);
 
                 if (morrowindFound) {
                     // Check if we have correct archive, other archives have Morrowind.bsa too
@@ -476,14 +469,12 @@ bool Wizard::UnshieldWorker::setupComponent(Component component)
                 }
             } else {
 
-                if (findInCab(name + QLatin1String(".bsa"), unshield)) {
+                if (findInCab(name + QLatin1String(".bsa"), file)) {
                     cabFile = file;
                     found = true;
                 }
             }
 
-            // Close the current archive
-            unshield_close(unshield);
         }
 
         if (!found) {
@@ -778,6 +769,7 @@ bool Wizard::UnshieldWorker::extractCab(const QString &cabFile, const QString &d
 
     if (!unshield) {
         emit error(tr("Failed to open InstallShield Cabinet File."), tr("Opening %1 failed.").arg(cabFile));
+        unshield_close(unshield);
         return false;
     }
 
@@ -878,7 +870,7 @@ QStringList Wizard::UnshieldWorker::findDirectories(const QString &dirName, cons
     return findFiles(dirName, path, 0, true, true);
 }
 
-Unshield* Wizard::UnshieldWorker::openCab(const QString &cabFile)
+bool Wizard::UnshieldWorker::findInCab(const QString &fileName, const QString &cabFile)
 {
     QByteArray array(cabFile.toUtf8());
 
@@ -888,16 +880,8 @@ Unshield* Wizard::UnshieldWorker::openCab(const QString &cabFile)
     if (!unshield) {
         emit error(tr("Failed to open InstallShield Cabinet File."), tr("Opening %1 failed.").arg(cabFile));
         unshield_close(unshield);
-        return NULL;
-    }
-
-    return unshield;
-}
-
-bool Wizard::UnshieldWorker::findInCab(const QString &fileName, Unshield *unshield)
-{
-    if (!unshield)
         return false;
+    }
 
     for (int i=0; i<unshield_file_group_count(unshield); ++i)
     {
diff --git a/apps/wizard/unshield/unshieldworker.hpp b/apps/wizard/unshield/unshieldworker.hpp
index e5a712977..2e509d116 100644
--- a/apps/wizard/unshield/unshieldworker.hpp
+++ b/apps/wizard/unshield/unshieldworker.hpp
@@ -63,8 +63,7 @@ namespace Wizard
         bool extractCab(const QString &cabFile, const QString &destination);
         bool extractFile(Unshield *unshield, const QString &destination, const QString &prefix, int index, int counter);
 
-        Unshield* openCab(const QString &cabFile);
-        bool findInCab(const QString &fileName, Unshield *unshield);
+        bool findInCab(const QString &fileName, const QString &cabFile);
 
         QString findFile(const QString &fileName, const QString &path);