Skip to content
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.

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

Windows installer: Prefer Geany installation directory over user's HOME #1324

Merged
merged 1 commit into from
Jun 23, 2024

Conversation

eht16
Copy link
Member

@eht16 eht16 commented Apr 14, 2024

If no explicit installation directory was specified and an existing, Geany installation was found, then use its installation directory.

Closes #1321.

If no explicit installation directory was specified and an existing,
Geany installation was found, then use its installation directory.

Closes geany#1321.
@@ -401,6 +398,12 @@ Function .onInit
StrCpy $INSTDIR "$GEANY_INSTDIR"
${EndIf}

; if $INSTDIR has not been set yet above, set it to the profile directory for non-admin users
${If} $INSTDIR == ""
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The diff is a bit cluttered because of the variable rename (I don't know what was wrong with me naming it "Answer" :( ), the relevant part is here: we set $INSTDIR only to the user's profile directory if we didn't find a Geany installation before. Before the Geany installation was ignored if the installer was executed without administrative privileges.

@eht16 eht16 merged commit 739a801 into geany:master Jun 23, 2024
2 checks passed
@eht16 eht16 deleted the issue1321_fix_windows_user_installation branch June 23, 2024 21:06
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Default plugins folder incorrect / not found
1 participant