diff --git a/nw/gui/projtree.py b/nw/gui/projtree.py index 49ca0fcb..ea81c068 100644 --- a/nw/gui/projtree.py +++ b/nw/gui/projtree.py @@ -419,6 +419,9 @@ class GuiProjectTree(QTreeWidget): logger.error("No project open") return False + if not self.hasFocus(): + return False + if tHandle is None: tHandle = self.getSelectedHandle() diff --git a/tests/test_gui_doceditor.py b/tests/test_gui_doceditor.py index 9ef62951..de19fe9d 100644 --- a/tests/test_gui_doceditor.py +++ b/tests/test_gui_doceditor.py @@ -12,6 +12,7 @@ from PyQt5.QtCore import Qt from PyQt5.QtGui import QTextCursor from PyQt5.QtWidgets import QAction, QMessageBox +from nw.gui.projtree import GuiProjectTree from nw.constants import nwItemType, nwDocAction keyDelay = 2 @@ -24,6 +25,7 @@ def testGuiEditor_Main(qtbot, monkeypatch, nwGUI, fncDir, fncProj, refDir, outDi """ # Block message box monkeypatch.setattr(QMessageBox, "question", lambda *args: QMessageBox.Yes) + monkeypatch.setattr(GuiProjectTree, "hasFocus", lambda *args: True) # Create new, save, close project nwGUI.theProject.projTree.setSeed(42) diff --git a/tests/test_gui_projtree.py b/tests/test_gui_projtree.py index d49fa7a6..7d895deb 100644 --- a/tests/test_gui_projtree.py +++ b/tests/test_gui_projtree.py @@ -10,6 +10,8 @@ from tools import writeFile from PyQt5.QtCore import QItemSelectionModel from PyQt5.QtWidgets import QAction, QMessageBox +from nw.guimain import GuiMain +from nw.gui.projtree import GuiProjectTree from nw.constants import nwItemType, nwItemClass @pytest.mark.gui @@ -18,7 +20,8 @@ def testGuiProjTree_TreeItems(qtbot, caplog, monkeypatch, nwGUI, nwMinimal): """ # Block message box monkeypatch.setattr(QMessageBox, "question", lambda *args: QMessageBox.Yes) - monkeypatch.setattr("nw.guimain.GuiMain.editItem", lambda *args: None) + monkeypatch.setattr(GuiMain, "editItem", lambda *args: None) + monkeypatch.setattr(GuiProjectTree, "hasFocus", lambda *args: True) nwGUI.theProject.projTree.setSeed(42) nwTree = nwGUI.treeView