Win installer: check that the Win installer is not already running

diff --git a/development/Win32/packaging/installer/include/init.nsh b/development/Win32/packaging/installer/include/init.nsh
index b85e11593d03b677bdb1ec78b8834f489b6d173d..bc85927bc75e3ce80730c92fcef7f3c869df8f32 100644 (file)
--- a/development/Win32/packaging/installer/include/init.nsh
+++ b/development/Win32/packaging/installer/include/init.nsh
@@ -603,31 +603,21 @@ Function .onInit
     Quit
   ${endif}
   
-  # Fixme: the Unicode version of FindProcDLL::FindProc
-  # reports always that it is already running
-  # check that the installer is not currently running
-  #FindProcDLL::FindProc "${BundleExeFile}"
-  #${if} $R0 == "1"
-  # MessageBox MB_OK|MB_ICONSTOP "$(InstallRunning)" /SD IDOK
-  # Abort
-  #${endif}
-  #FindProcDLL::FindProc "${ExeFile}"
-  #${if} $R0 == "1"
-  # MessageBox MB_OK|MB_ICONSTOP "$(InstallRunning)" /SD IDOK
-  # Abort
-  #${endif}
-  #System::Call 'kernel32::CreateMutexA(i 0, i 0, t "${BundleExeFile}.Instance") i .r1 ?e'
-  #Pop $R0
-  #${if} $R0 != "0"
-  # MessageBox MB_OK|MB_ICONSTOP "$(InstallRunning)" /SD IDOK
-  # Abort
-  #${endif}
-  #System::Call 'kernel32::CreateMutexA(i 0, i 0, t "${ExeFile}.Instance") i .r1 ?e'
-  #Pop $R0
-  #${if} $R0 != "0"
-  # MessageBox MB_OK|MB_ICONSTOP "$(InstallRunning)" /SD IDOK
-  # Abort
-  #${endif}
+  # check that another LyX installer is not currently running
+  !if ${SETUPTYPE} == STANDARD
+   FindProcDLL::FindProc "${BundleExeFile}"
+   ${if} $R0 == "1"
+    MessageBox MB_OK|MB_ICONSTOP "$(InstallRunning)" /SD IDOK
+    Abort
+   ${endif}
+  !endif
+  !if ${SETUPTYPE} == BUNDLE
+   FindProcDLL::FindProc "${ExeFile}"
+   ${if} $R0 == "1"
+    MessageBox MB_OK|MB_ICONSTOP "$(InstallRunning)" /SD IDOK
+    Abort
+   ${endif}
+  !endif
   
   # Check that LyX is not currently running
   FindProcDLL::FindProc "lyx.exe"