diff options
| author | TanninOne <seppleviathan@gmx.de> | 2015-09-26 19:54:31 +0200 |
|---|---|---|
| committer | TanninOne <seppleviathan@gmx.de> | 2015-09-26 19:54:31 +0200 |
| commit | de98fe64a3ef23be8124e69614d4ec79aac5c637 (patch) | |
| tree | 48083f2b8d9e914fcb96ed0e0857ac79a34994f8 /src/installationmanager.cpp | |
| parent | 462c549f7725810e55131a62f731357c6b2396ae (diff) | |
| parent | 364c385f1a5f71c3eb6a80b44c26ddd7af012ec8 (diff) | |
Merge pull request #1 from ThosRTanner/master
Small cleanups
Diffstat (limited to 'src/installationmanager.cpp')
| -rw-r--r-- | src/installationmanager.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/installationmanager.cpp b/src/installationmanager.cpp index 0f66a7e8..75abd750 100644 --- a/src/installationmanager.cpp +++ b/src/installationmanager.cpp @@ -676,6 +676,11 @@ bool InstallationManager::install(const QString &fileName, GuessedValue<QString> }
qDebug("using mod name \"%s\" (id %d) -> %s", modName->toUtf8().constData(), modID, qPrintable(m_CurrentFile));
+ //If there's an archive already open, close it. This happens with the bundle
+ //installer when it uncompresses a split archive, then finds it has a real archive
+ //to deal with.
+ m_CurrentArchive->close();
+
// open the archive and construct the directory tree the installers work on
bool archiveOpen = m_CurrentArchive->open(ToWString(QDir::toNativeSeparators(fileName)).c_str(),
new MethodCallback<InstallationManager, void, LPSTR>(this, &InstallationManager::queryPassword));
|
