Improve handling of project closing

novelwriter/core/project.py

@@ -382,9 +382,11 @@ class NWProject(QObject):
         self._storage.runPostSaveTasks(autoSave=autoSave)
 
         # Update recent projects
-        CONFIG.recentProjects.update(
-            self._storage.storagePath, self._data.name, sum(self._data.currCounts), saveTime
-        )
+        storePath = self._storage.storagePath
+        if storePath:
+            CONFIG.recentProjects.update(
+                storePath, self._data.name, sum(self._data.currCounts), saveTime
+            )
 
         self._storage.writeLockFile()
         self.mainGui.setStatus(self.tr("Saved Project: {0}").format(self._data.name))
@@ -393,7 +395,7 @@ class NWProject(QObject):
         return True
 
     def closeProject(self, idleTime: float = 0.0) -> None:
-        """Close the current project and clear all meta data."""
+        """Close the project."""
         logger.info("Closing project")
         self._options.saveSettings()
         self._tree.writeToCFile()

novelwriter/core/status.py

@@ -129,7 +129,7 @@ class NWStatus:
 
     def name(self, key: str | None) -> str:
         """Return the name associated with a given key."""
-        if key in self._store:
+        if key and key in self._store:
             return self._store[key]["name"]
         elif self._default is not None:
             return self._store[self._default]["name"]
@@ -137,7 +137,7 @@ class NWStatus:
 
     def cols(self, key: str | None) -> tuple[int, int, int]:
         """Return the colours associated with a given key."""
-        if key in self._store:
+        if key and key in self._store:
             return self._store[key]["cols"]
         elif self._default is not None:
             return self._store[self._default]["cols"]
@@ -145,7 +145,7 @@ class NWStatus:
 
     def count(self, key: str | None) -> int:
         """Return the count associated with a given key."""
-        if key in self._store:
+        if key and key in self._store:
             return self._store[key]["count"]
         elif self._default is not None:
             return self._store[self._default]["count"]
@@ -153,7 +153,7 @@ class NWStatus:
 
     def icon(self, key: str | None) -> QIcon:
         """Return the icon associated with a given key."""
-        if key in self._store:
+        if key and key in self._store:
             return self._store[key]["icon"]
         elif self._default is not None:
             return self._store[self._default]["icon"]
@@ -186,9 +186,9 @@ class NWStatus:
             self._store[key]["count"] = 0
         return
 
-    def increment(self, key: str) -> None:
+    def increment(self, key: str | None) -> None:
         """Increment the counter for a given entry."""
-        if key in self._store:
+        if key and key in self._store:
             self._store[key]["count"] += 1
         return