Make sure args.getSettingsPath() returns the correct directory #3956
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
|
Not sure if this is a 2.3 candidate, because I am not able to test it. The fixed bug is obvious though. |
a53a65b to
5b1cbe8
Compare
uklotzde
approved these changes
Jun 6, 2021
|
Ok, then let's merge and hope for the best ;) LGTM |
|
The changes need to be merged to main now. Non-trivial merge conflicts. |
|
Yes, it looks like the call to Sandbox::checkSandboxed() has been lost in main. I think that is wrong, right? |
|
Thanks! |
daschuer
added a commit
to daschuer/mixxx
that referenced
this pull request
Jun 19, 2021
… introduced by mixxxdj#3956 This is a bandaid. The reintroduced issue of settings path access before checking the sandbox will be fixed in a follow up PR
daschuer
added a commit
to daschuer/mixxx
that referenced
this pull request
Jun 19, 2021
… introduced by mixxxdj#3956 This is a band aid. The reintroduced issue of settings path access before checking the sandbox will be fixed in a follow up PR.
daschuer
added a commit
to daschuer/mixxx
that referenced
this pull request
Jun 19, 2021
… introduced by mixxxdj#3956 This is a band aid. The reintroduced issue of settings path access before checking the sandbox will be fixed in a follow up PR.
daschuer
added a commit
to daschuer/mixxx
that referenced
this pull request
Jun 19, 2021
… introduced by mixxxdj#3956 This is a band aid. The reintroduced issue of settings path access before checking the sandbox will be fixed in a follow up PR.
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.
This makes sure that getSettingsPath() always return the right directory.
This is done by writing it back using args.getSettingsPathSet() when it was changed by sandboxing.
I have also moved the code into main, to make sure that CmdlineArgs::Instance()->getSettingsPath() can be used unconditionally.