[Fix] Treat GPTK Wine like regular Wine #2880
Merged
Conversation
This file contains hidden or 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
4 tasks
|
It works with this build of Heroic, It launches the game instead of the wine explorer, good job! |
|
Hi, I can confirm this works on Sonoma, on a MBP M1 Pro, good job :) |
When launching GPTK, Heroic simply uses the underlying `wine64` binary. This binary is a (mostly) normal Wine binary, meaning it's meant to be launched with the WINEPREFIX environment variable set to the desired Wineprefix & a single argument (the executable to run). `gameportingtoolkit` on the other hand is the wrapper around Wine, not taking in a WINEPREFIX & instead requiring two arguments (the prefix, then the executable to run) We were running `wine64`, but were passing it parameters intended for `gameportingtoolkit`. I'm not sure how this ever worked While touching the responsible function (getWineFlags) I've also made it a little more type-safe & removed the unused `gameSettings` parameter
pakkographic
approved these changes
Jul 23, 2023
CommandMC
added
pr:ready-for-review
|
@flavioislima I think you are the best person to review this since you implemented it? I do see comments saying it works so I'm fine with that too |
flavioislima
approved these changes
Jul 23, 2023
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.
When launching GPTK, Heroic simply uses the underlying
wine64binary. This binary is a (mostly) normal Wine binary, meaning it's meant to be launched with the WINEPREFIX environment variable set to the desired Wineprefix & a single argument (the executable to run).gameportingtoolkiton the other hand is the wrapper around Wine, not taking in a WINEPREFIX & instead requiring two arguments (the prefix, then the executable to run)We were running
wine64, but were passing it parameters intended forgameportingtoolkit. I'm not sure how this ever workedWhile touching the responsible function (getWineFlags) I've also made it a little more type-safe & removed the unused
gameSettingsparameterNote that I cannot test this myself, as I don't have a device running macOS, however there were plenty of people with this issue on our Discord & here (#2858)
Use the following Checklist if you have changed something on the Backend or Frontend: