Project files: prevent SQL tabs loss while closing the application

mgrojo · mgrojo · commit fb43e0677a4e · 2022-07-31T17:43:49.000+02:00
When a project file is loaded, changes are made, and the event close is triggered, we lose the SQL file contents, because the project file is saved when the tabs are close. Now the order is reversed, so the project saving catches the correct state. See issue #3007
diff --git a/src/MainWindow.cpp b/src/MainWindow.cpp
@@ -801,12 +801,14 @@ bool MainWindow::closeFiles()
             return false;
     }
 
+    bool projectClosed = closeProject();
+
     // Now all tabs can be closed at once without asking user.
     // Close tabs in reverse order (so indexes are not changed in the process).
     for(int i=ui->tabSqlAreas->count()-1; i>=0; i--)
         closeSqlTab(i, /* force */ true, /* askSaving */ false);
 
-    return closeProject();
+    return projectClosed;
 }
 
 bool MainWindow::closeProject()

Original file line number	Diff line number	Diff line change
`@@ -801,12 +801,14 @@ bool MainWindow::closeFiles()`
`801`	`801`	`return false;`
`802`	`802`	`}`
`803`	`803`
	`804`	`+ bool projectClosed = closeProject();`
	`805`	`+`
`804`	`806`	`// Now all tabs can be closed at once without asking user.`
`805`	`807`	`// Close tabs in reverse order (so indexes are not changed in the process).`
`806`	`808`	`for(int i=ui->tabSqlAreas->count()-1; i>=0; i--)`
`807`	`809`	`closeSqlTab(i, /* force / true, / askSaving */ false);`
`808`	`810`
`809`		`- return closeProject();`
	`811`	`+ return projectClosed;`
`810`	`812`	`}`
`811`	`813`
`812`	`814`	`bool MainWindow::closeProject()`