diff --git a/novelwriter/guimain.py b/novelwriter/guimain.py index 22055464..bed57b5c 100644 --- a/novelwriter/guimain.py +++ b/novelwriter/guimain.py @@ -338,8 +338,6 @@ class GuiMain(QMainWindow): self.asProjTimer.start() self.asDocTimer.start() self.mainStatus.clearStatus() - - # Handle Windows Mode self.showNormal() logger.debug("Ready: GUI") diff --git a/tests/test_gui/test_gui_guimain.py b/tests/test_gui/test_gui_guimain.py index 4ed784be..659b44ee 100644 --- a/tests/test_gui/test_gui_guimain.py +++ b/tests/test_gui/test_gui_guimain.py @@ -72,14 +72,30 @@ def testGuiMain_ProjectBlocker(nwGUI): @pytest.mark.gui -def testGuiMain_Launch(qtbot, monkeypatch, nwGUI, prjLipsum): +def testGuiMain_Launch(qtbot, monkeypatch, nwGUI, projPath): """Test the handling of launch tasks.""" monkeypatch.setattr(GuiProjectLoad, "exec_", lambda *a: None) monkeypatch.setattr(GuiProjectLoad, "result", lambda *a: QDialog.Accepted) CONFIG.lastNotes = "0x0" + buildTestProject(nwGUI, projPath) # Open Lipsum project - nwGUI.postLaunchTasks(prjLipsum) + nwGUI.postLaunchTasks(projPath) + nwGUI.closeProject() + + # Project open fails + with monkeypatch.context() as mp: + mp.setattr(SHARED, "openProject", lambda *a: False) + assert nwGUI.openProject(projPath) is False + + # Handle locked project + with monkeypatch.context() as mp: + mp.setattr(SHARED, "openProject", lambda *a, **k: False) + SHARED._lockedBy = ["a", "b", "c", "d"] + assert nwGUI.openProject(projPath) is False + SHARED._lockedBy = None + + assert nwGUI.openProject(projPath) is True nwGUI.closeProject() # Check that release notes opened