Check return value of 'virtual bool QFile::open(QIODeviceBase::OpenMode)'
Signed-off-by: Dylan Schooner <dschooner05@gmail.com>
This commit is contained in:
@@ -15,7 +15,10 @@ void createOverrides(const QString& name, const QString& parent_folder, const QS
|
||||
FS::ensureFilePathExists(file_path);
|
||||
|
||||
QFile file(file_path);
|
||||
file.open(QFile::WriteOnly);
|
||||
if (!file.open(QFile::WriteOnly)) {
|
||||
qWarning() << "Failed to open file '" << file.fileName() << "' for writing!";
|
||||
return;
|
||||
}
|
||||
|
||||
QDirIterator override_iterator(override_path, QDirIterator::Subdirectories);
|
||||
while (override_iterator.hasNext()) {
|
||||
@@ -43,7 +46,10 @@ QStringList readOverrides(const QString& name, const QString& parent_folder)
|
||||
|
||||
QStringList previous_overrides;
|
||||
|
||||
file.open(QFile::ReadOnly);
|
||||
if (!file.open(QFile::ReadOnly)) {
|
||||
qWarning() << "Failed to open file '" << file.fileName() << "' for reading!";
|
||||
return previous_overrides;
|
||||
}
|
||||
|
||||
QString entry;
|
||||
do {
|
||||
|
||||
@@ -153,25 +153,29 @@ void PackInstallTask::install()
|
||||
QFile packJson(m_stagingPath + "/minecraft/pack.json");
|
||||
QDir jarmodDir = QDir(m_stagingPath + "/unzip/instMods");
|
||||
if (packJson.exists()) {
|
||||
packJson.open(QIODevice::ReadOnly | QIODevice::Text);
|
||||
QJsonDocument doc = QJsonDocument::fromJson(packJson.readAll());
|
||||
packJson.close();
|
||||
if (packJson.open(QIODevice::ReadOnly | QIODevice::Text)) {
|
||||
QJsonDocument doc = QJsonDocument::fromJson(packJson.readAll());
|
||||
packJson.close();
|
||||
|
||||
// we only care about the libs
|
||||
QJsonArray libs = doc.object().value("libraries").toArray();
|
||||
// we only care about the libs
|
||||
QJsonArray libs = doc.object().value("libraries").toArray();
|
||||
|
||||
for (const auto& value : libs) {
|
||||
QString nameValue = value.toObject().value("name").toString();
|
||||
if (!nameValue.startsWith("net.minecraftforge")) {
|
||||
continue;
|
||||
for (const auto& value : libs) {
|
||||
QString nameValue = value.toObject().value("name").toString();
|
||||
if (!nameValue.startsWith("net.minecraftforge")) {
|
||||
continue;
|
||||
}
|
||||
|
||||
GradleSpecifier forgeVersion(nameValue);
|
||||
|
||||
components->setComponentVersion("net.minecraftforge",
|
||||
forgeVersion.version().replace(m_pack.mcVersion, "").replace("-", ""));
|
||||
packJson.remove();
|
||||
fallback = false;
|
||||
break;
|
||||
}
|
||||
|
||||
GradleSpecifier forgeVersion(nameValue);
|
||||
|
||||
components->setComponentVersion("net.minecraftforge", forgeVersion.version().replace(m_pack.mcVersion, "").replace("-", ""));
|
||||
packJson.remove();
|
||||
fallback = false;
|
||||
break;
|
||||
} else {
|
||||
qWarning() << "Failed to open file '" << packJson.fileName() << "' for reading!";
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user