Skip to content

Commit

Permalink
Use INSTALLFOLDER in Windows drawpile:// handling
Browse files Browse the repository at this point in the history
Instead of INSTALLDIR, because that doesn't exist. This should make the
URL registration for drawpile:// URLs actually work in Windows, which it
didn't before due to missing the path to the executable.
  • Loading branch information
askmeaboutlo0m committed Aug 25, 2023
1 parent 33e9dbb commit 8f90d91
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 2 deletions.
1 change: 1 addition & 0 deletions ChangeLog
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ Unreleased Version 2.2.0-pre
* Feature: Allow increasing and decreasing key frame exposure. Thanks Tabuley for suggesting.
* Fix: Properly update the view when the canvas size changes, rather than leaving stale areas outside of the canvas.
* Feature: Add shortcuts to swap the contents of brush slots to allow for a kind of toggling behavior using a single shortcut. Thanks xxxx for suggesting.
* Fix: Make drawpile:// URL handling actually work on Windows. Thanks Sal for reporting.

2023-07-31 Version 2.2.0-beta.6
* Fix: Don't forget account password when entering a wrong session password.
Expand Down
4 changes: 2 additions & 2 deletions cmake/DrawpileFileExtensions.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -462,10 +462,10 @@ function(_wxs_generate_urls out_var exe)
"\t\t\t<RegistryValue Name=\"URL Protocol\" Value=\"\" Type=\"string\"/>\n"
"\t\t\t<RegistryValue Value=\"URL: ${NAME}\" Type=\"string\"/>\n"
"\t\t\t<RegistryKey Key=\"DefaultIcon\">\n"
"\t\t\t\t<RegistryValue Value=\"[INSTALLDIR]${exe}\" Type=\"string\"/>\n"
"\t\t\t\t<RegistryValue Value=\"[INSTALLFOLDER]${exe}\" Type=\"string\"/>\n"
"\t\t\t</RegistryKey>\n"
"\t\t\t<RegistryKey Key=\"shell\\open\\command\">\n"
"\t\t\t\t<RegistryValue Value=\"&quot\;[INSTALLDIR]${exe}&quot\; &quot\;%1&quot\;\" Type=\"string\"/>\n"
"\t\t\t\t<RegistryValue Value=\"&quot\;[INSTALLFOLDER]${exe}&quot\; &quot\;%1&quot\;\" Type=\"string\"/>\n"
"\t\t\t</RegistryKey>\n"
"\t\t</RegistryKey>\n"
)
Expand Down

0 comments on commit 8f90d91

Please sign in to comment.