Windows: Fixes #11508: Prevent installer from recognizing itself as a running instance of Joplin and switch back to electron-builder v24 #11541
+226
−272
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…d `@electron/rebuild` (laurent22#11512)" This reverts commit ac28d31.
…self as a running instance of Joplin and switch back to electron-builder v24
laurent22
reviewed
Dec 19, 2024
| @@ -0,0 +1,13 @@ | |||
| diff --git a/templates/nsis/include/allowOnlyOneInstallerInstance.nsh b/templates/nsis/include/allowOnlyOneInstallerInstance.nsh | |||
There was a problem hiding this comment.
Thanks for fixing this. Could you please add a comment here to explain what it does and why it's there (and linking to this PR for example). You can add comments with the # prefix
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Summary
This pull request reverts ac28d31, which does not seem to have fixed #11508. ac28d31 upgraded to an alpha version of
electron-builderv26 because it includes a fix for this upstream issue.electron-builderv25 has an issue that breaks Joplin's build.This may fix #11508 and is an alternative to #11540.
Important
This change causes a regression: On my development Windows VM, ac28d31 (the commit that this PR reverts) resolved issue #11142. With this change, the user will need to manually close Joplin, as was the case before v3.2.5. See the testing steps for details.
See also #11540.
Testing plan
Note
I haven't been able to reproduce #11508 on my Windows 11 development virtual machine. The below steps are to test for regressions.
Windows 11:
Joplin Setup 3.2.5.exeusingyarn distfrompackages/app-desktop.Joplin Setup 3.2.5.exe.At this point, the installer shows a "Joplin cannot be closed. Please close it manually and click Retry to continue" dialog.