summaryrefslogtreecommitdiff
path: root/src/installationmanager.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/installationmanager.cpp')
-rw-r--r--src/installationmanager.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/installationmanager.cpp b/src/installationmanager.cpp
index 6101cf39..7d431f02 100644
--- a/src/installationmanager.cpp
+++ b/src/installationmanager.cpp
@@ -70,7 +70,8 @@ static T resolveFunction(QLibrary &lib, const char *name)
InstallationManager::InstallationManager()
- : m_InstallationProgress(nullptr)
+ : m_ParentWidget(nullptr)
+ , m_InstallationProgress(nullptr)
, m_SupportedExtensions({ "zip", "rar", "7z", "fomod", "001" })
{
QLibrary archiveLib("dlls\\archive.dll");
@@ -441,7 +442,6 @@ QString InstallationManager::generateBackupName(const QString &directoryName) co
bool InstallationManager::testOverwrite(GuessedValue<QString> &modName, bool *merge) const
{
QString targetDirectory = QDir::fromNativeSeparators(m_ModsDirectory + "\\" + modName);
-
while (QDir(targetDirectory).exists()) {
QueryOverwriteDialog overwriteDialog(m_ParentWidget);
if (overwriteDialog.exec()) {
@@ -644,7 +644,7 @@ bool InstallationManager::install(const QString &fileName, GuessedValue<QString>
int categoryID = 0;
QString repository = "Nexus";
- QString metaName = fileName.mid(0).append(".meta");
+ QString metaName = fileName + ".meta";
if (QFile(metaName).exists()) {
QSettings metaFile(metaName, QSettings::IniFormat);
modID = metaFile.value("modID", 0).toInt();
@@ -697,8 +697,8 @@ bool InstallationManager::install(const QString &fileName, GuessedValue<QString>
});
foreach (IPluginInstaller *installer, m_Installers) {
- // don't use inactive installers
- if (!installer->isActive()) {
+ // don't use inactive installers (installer can't be null here but vc static code analysis thinks it could)
+ if ((installer == nullptr) || !installer->isActive()) {
continue;
}