Merge 2.6.1 release into main

2025-02-02 18:54:08 +01:00
parent c1b35b6672 2401fc2531
commit a87e8289f7
34 changed files with 3462 additions and 3069 deletions
@@ -847,7 +847,7 @@ class GuiMain(QMainWindow):

    def closeMain(self) -> bool:
        """Save everything, and close novelWriter."""
-        if SHARED.hasProject and not SHARED.question("%s<br>%s" % (
+        if SHARED.hasProject and CONFIG.askBeforeExit and not SHARED.question("%s<br>%s" % (
            self.tr("Do you want to exit novelWriter?"),
            self.tr("Changes are saved automatically.")
        )):