From 4fa6329eb6d62ac52885d7ac279fbf7a3343b923 Mon Sep 17 00:00:00 2001
From: Veronica Berglyd Olsen <1619840+vkbo@users.noreply.github.com>
Date: Tue, 22 Nov 2022 13:05:05 +0100
Subject: [PATCH] Fix tests and minor issues

---
 novelwriter/dialogs/projdetails.py         | 2 +-
 novelwriter/gui/components.py              | 7 +++----
 tests/test_dialogs/test_dlg_projdetails.py | 5 +++++
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/novelwriter/dialogs/projdetails.py b/novelwriter/dialogs/projdetails.py
index e41f5400..00d3d4df 100644
--- a/novelwriter/dialogs/projdetails.py
+++ b/novelwriter/dialogs/projdetails.py
@@ -460,7 +460,7 @@ class GuiProjectDetailsContents(QWidget):
         if tHandle != self._currentRoot:
             self._prepareData(tHandle)
             self._populateTree()
-            self._currentRoot = tHandle
+            self._currentRoot = self.novelValue.handle
         return
 
     @pyqtSlot()
diff --git a/novelwriter/gui/components.py b/novelwriter/gui/components.py
index 2d5b4501..9b1cf2d4 100644
--- a/novelwriter/gui/components.py
+++ b/novelwriter/gui/components.py
@@ -103,10 +103,7 @@ class NovelSelector(QComboBox):
 
         if includeAll:
             self.insertSeparator(self.count())
-            if prefix:
-                self.addItem(prefix.format(self.tr("All Novel Folders")), "")
-            else:
-                self.addItem(icon, self.tr("All Novel Folders"), "")
+            self.addItem(icon, self.tr("All Novel Folders"), "")
 
         self.setHandle(handle)
         self.setEnabled(self.count() > 1)
@@ -120,6 +117,8 @@ class NovelSelector(QComboBox):
 
     @pyqtSlot(int)
     def _indexChanged(self, index):
+        """Re-emit the change of selected novel signal, unless blocked.
+        """
         if not self._blockSignal:
             self.novelSelectionChanged.emit(self.currentData())
         return
diff --git a/tests/test_dialogs/test_dlg_projdetails.py b/tests/test_dialogs/test_dlg_projdetails.py
index e8d6053c..92df7f39 100644
--- a/tests/test_dialogs/test_dlg_projdetails.py
+++ b/tests/test_dialogs/test_dlg_projdetails.py
@@ -93,6 +93,11 @@ def testDlgProjDetails_Dialog(qtbot, nwGUI, nwLipsum):
         assert tocTree.topLevelItem(i).text(tocTab.C_PAGES) == thePages[i]
         assert tocTree.topLevelItem(i).text(tocTab.C_PAGE) == thePage[i]
 
+    # Re-populate
+    assert tocTab._currentRoot is None
+    tocTab._novelValueChanged("7a992350f3eb6")     # Not a root
+    assert tocTab._currentRoot == "b3643d0f92e32"  # The actual novel root
+
     # qtbot.stop()
 
     # Clean Up