Skip to content

Try to avoid dirty writes when crash while saving project file #3888

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
yfdyh000 wants to merge 1 commit into
base: master
Choose a base branch
from
+18 −3
Open

Try to avoid dirty writes when crash while saving project file #3888

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 18 additions & 3 deletions src/MainWindow.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3178,7 +3178,8 @@ void MainWindow::saveProject(const QString& currentFilename)
currentProjectFilename = filename;
QApplication::setOverrideCursor(Qt::WaitCursor);

QXmlStreamWriter xml(&file);
QByteArray byteArray;
QXmlStreamWriter xml(&byteArray);
xml.writeStartDocument();
xml.writeStartElement("sqlb_project");

Expand Down Expand Up @@ -3285,7 +3286,6 @@ void MainWindow::saveProject(const QString& currentFilename)
xml.writeAttribute("name", ui->tabSqlAreas->tabText(i));
if(sqlFilename.isEmpty()) {
xml.writeCharacters(sqlArea->getSql());
sqlArea->getEditor()->setModified(false);
} else {
xml.writeAttribute("filename", sqlFilename);
// Backwards compatibility, so older versions do not break.
Expand All @@ -3300,8 +3300,23 @@ void MainWindow::saveProject(const QString& currentFilename)

xml.writeEndElement();
xml.writeEndDocument();
file.commit();
QTextStream out(&file);
out << byteArray;
if (!file.commit())
{
QMessageBox::warning(this, QApplication::applicationName(), tr("Failed to save project file '%1'!").arg(currentProjectFilename));
QApplication::restoreOverrideCursor();
return;
}

for (int i = 0; i < ui->tabSqlAreas->count(); i++)
{
SqlExecutionArea* sqlArea = qobject_cast<SqlExecutionArea*>(ui->tabSqlAreas->widget(i));
QString sqlFilename = sqlArea->fileName();
if (sqlFilename.isEmpty()) {
sqlArea->getEditor()->setModified(false);
}
}
addToRecentFilesMenu(filename);
setCurrentFile(db.currentFile());
isProjectModified = false;
Expand Down