Fix some annotations and add deleteLater to non-modal dialogs

vkbo · Nov 27, 2023 · 50a9b5b · 50a9b5b
1 parent 4fa2027
commit 50a9b5b
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/novelwriter/core/index.py b/novelwriter/core/index.py
@@ -551,7 +551,7 @@ def getHandleHeaderCount(self, tHandle: str) -> int:
         return 0
 
     def getTableOfContents(
-        self, rHandle: str, maxDepth: int, skipExcl: bool = True
+        self, rHandle: str | None, maxDepth: int, skipExcl: bool = True
     ) -> list[tuple[str, int, str, int]]:
         """Generate a table of contents up to a maximum depth."""
         tOrder = []

diff --git a/novelwriter/dialogs/about.py b/novelwriter/dialogs/about.py
@@ -139,6 +139,7 @@ def showReleaseNotes(self) -> None:
     def _doClose(self) -> None:
         """Close the dialog"""
         self.close()
+        self.deleteLater()
         return
 
     ##

diff --git a/novelwriter/dialogs/projdetails.py b/novelwriter/dialogs/projdetails.py
@@ -98,6 +98,7 @@ def _doClose(self) -> None:
         """Save settings and close the dialog."""
         self._saveGuiSettings()
         self.close()
+        self.deleteLater()
         return
 
     ##
@@ -428,7 +429,7 @@ def updateValues(self) -> None:
     #  Internal Functions
     ##
 
-    def _prepareData(self, rootHandle: str) -> None:
+    def _prepareData(self, rootHandle: str | None) -> None:
         """Extract the information from the project index."""
         logger.debug("Populating ToC from handle '%s'", rootHandle)
         self._theToC = SHARED.project.index.getTableOfContents(rootHandle, 2)