Skip to content

fix: Wrap the nsProcess include in a !ifndef #6996

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jul 15, 2022
Merged

fix: Wrap the nsProcess include in a !ifndef #6996

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4f657b7
Wrap the nsProcess include in a !ifndef
titus-anromedonn Jul 12, 2022
524e56d
Create gentle-singers-sip.md
mmaietta Jul 12, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .changeset/gentle-singers-sip.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"app-builder-lib": patch
---

fix: Wrap the nsProcess.nsh include in a !ifndef in case it has already been imported in a custom install script
4 changes: 3 additions & 1 deletion packages/app-builder-lib/templates/nsis/include/allowOnlyOneInstallerInstance.nsh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
!include "nsProcess.nsh"
!ifndef nsProcess::FindProcess
!include "nsProcess.nsh"
!endif

!ifmacrondef customCheckAppRunning
!include "getProcessInfo.nsh"
Expand Down