From e2ee3da9d144f648b80197ddc817152f151b5b3f Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Mon, 18 Jan 2016 16:00:37 -0800 Subject: [PATCH] fix comparison for FindProc call --- cmake/templates/NSIS.template.in | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/cmake/templates/NSIS.template.in b/cmake/templates/NSIS.template.in index 2d7d8c6abf..2a5618ce8a 100644 --- a/cmake/templates/NSIS.template.in +++ b/cmake/templates/NSIS.template.in @@ -988,17 +988,17 @@ FunctionEnd !macro PromptForRunningApplication applicationName displayName FindProcDLL::FindProc ${applicationName} - IntCmp $R0 1 0 notRunning + ${If} $R0 == 1 MessageBox MB_OK|MB_ICONEXCLAMATION "The High Fidelity ${displayName} is running. Please close it first." /SD IDOK Abort - notRunning: + ${EndIf} !macroend !macro CheckForRunningApplications - !insertmacro PromptForRunningApplication "@INTERFACE_WIN_EXEC_NAME@" "Client" - !insertmacro PromptForRunningApplication "@CONSOLE_WIN_EXEC_NAME@" "@CONSOLE_SHORTCUT_NAME@" - !insertmacro PromptForRunningApplication "@DS_EXEC_NAME@" "domain-server" - !insertmacro PromptForRunningApplication "@AC_EXEC_NAME@" "assignment-client" + !insertmacro PromptForRunningApplication "$INSTDIR\@INTERFACE_WIN_EXEC_NAME@" "Client" + !insertmacro PromptForRunningApplication "$INSTDIR\@CONSOLE_WIN_EXEC_NAME@" "@CONSOLE_SHORTCUT_NAME@" + !insertmacro PromptForRunningApplication "$INSTDIR\@DS_EXEC_NAME@" "domain-server" + !insertmacro PromptForRunningApplication "$INSTDIR\@AC_EXEC_NAME@" "assignment-client" !macroend ;--------------------------------