From c164e48c23db1f1502b4f402fbd56089f893facb Mon Sep 17 00:00:00 2001
From: Dan Paulat <dpaulat@gmail.com>
Date: Sat, 16 Mar 2024 17:20:36 -0500
Subject: [PATCH] Close Supercell Wx before install

---
 scwx-qt/scwx-qt.cmake   |  2 ++
 scwx-qt/wix.template.in | 18 +++++++++++-------
 2 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/scwx-qt/scwx-qt.cmake b/scwx-qt/scwx-qt.cmake
index 4ae651d6..79f1444b 100644
--- a/scwx-qt/scwx-qt.cmake
+++ b/scwx-qt/scwx-qt.cmake
@@ -619,6 +619,8 @@ if (MSVC)
     set(CPACK_GENERATOR                   WIX)
     set(CPACK_PACKAGE_EXECUTABLES         "supercell-wx;Supercell Wx")
     set(CPACK_WIX_UPGRADE_GUID            36AD0F51-4D4F-4B5D-AB61-94C6B4E4FE1C)
+    set(CPACK_WIX_TEMPLATE                "${CMAKE_CURRENT_SOURCE_DIR}/wix.template.in")
+    set(CPACK_WIX_EXTENSIONS              WiXUtilExtension)
 
     set(CPACK_INSTALL_CMAKE_PROJECTS
         "${CMAKE_CURRENT_BINARY_DIR};${CMAKE_PROJECT_NAME};supercell-wx;/")
diff --git a/scwx-qt/wix.template.in b/scwx-qt/wix.template.in
index 95ba7fa7..ee565b57 100644
--- a/scwx-qt/wix.template.in
+++ b/scwx-qt/wix.template.in
@@ -2,7 +2,9 @@
 
 <?include "cpack_variables.wxi"?>
 
-<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi" @CPACK_WIX_CUSTOM_XMLNS_EXPANDED@
+<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"
+    xmlns:util="http://schemas.microsoft.com/wix/UtilExtension"
+    @CPACK_WIX_CUSTOM_XMLNS_EXPANDED@
     RequiredVersion="3.6.3303.0">
 
     <Product Id="$(var.CPACK_WIX_PRODUCT_GUID)"
@@ -12,12 +14,7 @@
         Manufacturer="$(var.CPACK_PACKAGE_VENDOR)"
         UpgradeCode="$(var.CPACK_WIX_UPGRADE_GUID)">
 
-
-        <?if $(var.CPACK_WIX_INSTALL_SCOPE) = "NONE" ?>
-        <Package InstallerVersion="301" Compressed="yes"/>
-        <?else?>
-        <Package InstallerVersion="301" Compressed="yes" InstallScope="$(var.CPACK_WIX_INSTALL_SCOPE)"/>
-        <?endif?>
+        <Package InstallerVersion="301" Compressed="yes" InstallScope="perMachine"/>
 
         <Media Id="1" Cabinet="media1.cab" EmbedCab="yes"/>
 
@@ -47,6 +44,13 @@
         <UIRef Id="$(var.CPACK_WIX_UI_REF)" />
         <UIRef Id="WixUI_ErrorProgressText" />
 
+        <util:CloseApplication
+            Id="CloseSupercellWx"
+            Target="supercell-wx.exe"
+            RebootPrompt="no"
+            PromptToContinue="yes"
+            Description="Supercell Wx should be closed before continuing the install."/>
+
         <?include "properties.wxi"?>
         <?include "product_fragment.wxi"?>
     </Product>