diff options
| author | Tannin <devnull@localhost> | 2013-03-29 10:12:34 +0100 |
|---|---|---|
| committer | Tannin <devnull@localhost> | 2013-03-29 10:12:34 +0100 |
| commit | a47d9717884953b18b4b29e596d3e5a7d766e56e (patch) | |
| tree | 565a3f1371ff9727d31d01590f105496294570d3 /src/installationmanager.cpp | |
| parent | 10485e15e4de3e1a6c30733ad2d4850591d31509 (diff) | |
| parent | 59d6b7840b1e7fdbb7475010273047b7bb185d3a (diff) | |
Merge with default
Diffstat (limited to 'src/installationmanager.cpp')
| -rw-r--r-- | src/installationmanager.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/installationmanager.cpp b/src/installationmanager.cpp index 0c47bf49..1abb19da 100644 --- a/src/installationmanager.cpp +++ b/src/installationmanager.cpp @@ -517,7 +517,7 @@ bool InstallationManager::testOverwrite(const QString &modsDirectory, GuessedVal } // remove the directory with all content, then recreate it empty - removeDir(targetDirectory); + shellDelete(QStringList(targetDirectory), NULL); if (!QDir().mkdir(targetDirectory)) { // windows may keep the directory around for a moment, preventing its re-creation Sleep(100); @@ -694,6 +694,7 @@ bool InstallationManager::install(const QString &fileName, const QString &modsDi GuessedValue<QString> &modName, bool &hasIniTweaks) { QFileInfo fileInfo(fileName); + bool success = false; if (m_SupportedExtensions.find(fileInfo.suffix()) == m_SupportedExtensions.end()) { reportError(tr("File format \"%1\" not supported").arg(fileInfo.completeSuffix())); return false; @@ -706,6 +707,7 @@ bool InstallationManager::install(const QString &fileName, const QString &modsDi QString version = ""; QString newestVersion = ""; int categoryID = 0; + bool nameGuessed = false; QString metaName = fileName.mid(0).append(".meta"); if (QFile(metaName).exists()) { |