claunia/86Box
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Manager: Clean up the empty dir if the settings dialog process crashes when creating a new machine

Browse Source
This commit is contained in:
Alexander Babikov
2025-08-17 04:28:55 +05:00
parent 29596dec25
commit 271f45277e
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/qt/qt_vmmanager_main.cpp
View File

@@ -620,6 +620,7 @@ VMManagerMain::addNewSystem(const QString &name, const QString &dir, const QStri
disconnect(new_system->process, QOverload<int, QProcess::ExitStatus>::of(&QProcess::finished), nullptr, nullptr); disconnect(new_system->process, QOverload<int, QProcess::ExitStatus>::of(&QProcess::finished), nullptr, nullptr);
connect(new_system->process, QOverload<int, QProcess::ExitStatus>::of(&QProcess::finished), connect(new_system->process, QOverload<int, QProcess::ExitStatus>::of(&QProcess::finished),
[=](const int exitCode, const QProcess::ExitStatus exitStatus) { [=](const int exitCode, const QProcess::ExitStatus exitStatus) {
bool fail = false;
if (exitCode != 0 || exitStatus != QProcess::NormalExit) { if (exitCode != 0 || exitStatus != QProcess::NormalExit) {
qInfo().nospace().noquote() << "Abnormal program termination while creating new system: exit code " << exitCode << ", exit status " << exitStatus; qInfo().nospace().noquote() << "Abnormal program termination while creating new system: exit code " << exitCode << ", exit status " << exitStatus;
qInfo() << "Not adding system due to errors"; qInfo() << "Not adding system due to errors";
@@ -627,8 +628,7 @@ VMManagerMain::addNewSystem(const QString &name, const QString &dir, const QStri
(!displayName.isEmpty() ? displayName : name), QString::number(exitCode)); (!displayName.isEmpty() ? displayName : name), QString::number(exitCode));
QMessageBox::critical(this, tr("Error adding system"), QMessageBox::critical(this, tr("Error adding system"),
QString("%1\n\n%2").arg(errMsg, tr("The system will not be added."))); QString("%1\n\n%2").arg(errMsg, tr("The system will not be added.")));
delete new_system; fail = true;
return;
} }
// Create a new QFileInfo because the info from the old one may be cached // Create a new QFileInfo because the info from the old one may be cached
if (const auto fi = QFileInfo(new_system->config_file.absoluteFilePath()); !fi.exists()) { if (const auto fi = QFileInfo(new_system->config_file.absoluteFilePath()); !fi.exists()) {
@@ -638,6 +638,9 @@ VMManagerMain::addNewSystem(const QString &name, const QString &dir, const QStri
if (const bool result = qrmdir.rmdir(newSytemDirectory.path()); !result) { if (const bool result = qrmdir.rmdir(newSytemDirectory.path()); !result) {
qWarning() << "Error cleaning up the old directory for canceled operation. Continuing anyway."; qWarning() << "Error cleaning up the old directory for canceled operation. Continuing anyway.";
} }
fail = true;
}
if (fail) {
delete new_system; delete new_system;
return; return;
} }