From 1d19a900b152c53eb0c967e1568f28e99d701528 Mon Sep 17 00:00:00 2001
From: Veronica Berglyd Olsen <1619840+vkbo@users.noreply.github.com>
Date: Sun, 30 Jul 2023 21:57:27 +0200
Subject: [PATCH] Handle raise parent on all close events in build tools

---
 novelwriter/tools/manusbuild.py    | 4 ++++
 novelwriter/tools/manussettings.py | 3 +--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/novelwriter/tools/manusbuild.py b/novelwriter/tools/manusbuild.py
index 6f1b0d16..abbc51a6 100644
--- a/novelwriter/tools/manusbuild.py
+++ b/novelwriter/tools/manusbuild.py
@@ -65,6 +65,7 @@ class GuiManuscriptBuild(QDialog):
         logger.debug("Create: GuiManuscriptBuild")
         self.setObjectName("GuiManuscriptBuild")
 
+        self.guiParent  = parent
         self.mainGui    = mainGui
         self.mainTheme  = mainGui.mainTheme
         self.theProject = mainGui.theProject
@@ -249,6 +250,7 @@ class GuiManuscriptBuild(QDialog):
         """
         self._saveSettings()
         event.accept()
+        self.guiParent.raise_()  # Issue #1494
         self.deleteLater()
         return
 
@@ -276,6 +278,8 @@ class GuiManuscriptBuild(QDialog):
         )
         if savePath:
             self.buildPath.setText(savePath)
+        self.guiParent.raise_()  # Issue #1494
+        self.raise_()  # Issue #1494
         return
 
     @pyqtSlot()
diff --git a/novelwriter/tools/manussettings.py b/novelwriter/tools/manussettings.py
index c69eb679..e1ca2b05 100644
--- a/novelwriter/tools/manussettings.py
+++ b/novelwriter/tools/manussettings.py
@@ -209,10 +209,8 @@ class GuiBuildSettings(QDialog):
         elif role == QDialogButtonBox.AcceptRole:
             self._emitBuildData()
             self.close()
-            self.guiParent.raise_()  # Issue #1494
         elif role == QDialogButtonBox.RejectRole:
             self.close()
-            self.guiParent.raise_()  # Issue #1494
         return
 
     ##
@@ -227,6 +225,7 @@ class GuiBuildSettings(QDialog):
         self._askToSaveBuild()
         self._saveSettings()
         event.accept()
+        self.guiParent.raise_()  # Issue #1494
         self.deleteLater()
         return