Reproog/novelWriter
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix closing app with no project bug

Browse Source
This commit is contained in:
Veronica Berglyd Olsen
2024-11-08 17:30:54 +01:00
parent b28921d6c2
commit b0bcf8605c
3 changed files with 33 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
novelwriter/guimain.py
+18 -18
View File
@@ -845,33 +845,33 @@ class GuiMain(QMainWindow):
def closeMain(self) -> bool:
"""Save everything, and close novelWriter."""
if SHARED.hasProject and SHARED.question("%s<br>%s" % (
if SHARED.hasProject and not SHARED.question("%s<br>%s" % (
self.tr("Do you want to exit novelWriter?"),
self.tr("Changes are saved automatically.")
)):
logger.info("Exiting novelWriter")
return False
if not SHARED.focusMode:
CONFIG.setMainPanePos(self.splitMain.sizes())
CONFIG.setOutlinePanePos(self.outlineView.splitSizes())
if self.docViewerPanel.isVisible():
CONFIG.setViewPanePos(self.splitView.sizes())
logger.info("Exiting novelWriter")
CONFIG.showViewerPanel = self.docViewerPanel.isVisible()
wFull = Qt.WindowState.WindowFullScreen
if self.windowState() & wFull != wFull:
# Ignore window size if in full screen mode
CONFIG.setMainWinSize(self.width(), self.height())
if not SHARED.focusMode:
CONFIG.setMainPanePos(self.splitMain.sizes())
CONFIG.setOutlinePanePos(self.outlineView.splitSizes())
if self.docViewerPanel.isVisible():
CONFIG.setViewPanePos(self.splitView.sizes())
if SHARED.hasProject:
self.closeProject(True)
CONFIG.saveConfig()
CONFIG.showViewerPanel = self.docViewerPanel.isVisible()
wFull = Qt.WindowState.WindowFullScreen
if self.windowState() & wFull != wFull:
# Ignore window size if in full screen mode
CONFIG.setMainWinSize(self.width(), self.height())
QApplication.quit()
if SHARED.hasProject:
self.closeProject(True)
CONFIG.saveConfig()
return True
QApplication.quit()
return False
return True
def closeViewerPanel(self, byUser: bool = True) -> bool:
"""Close the document view panel."""