SkinLoader: Skip skin directory if "skin.xml" is missing #3933
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
This is a small fix that is useful on it's own, but also improves forward compatibility with the new QML skin system. If you work on a QML skin and have it configured in the settings, then switch to a 2.3-based branch, the skin obviously won't load. But if the skin directory exists (e.g. because you have unstages files in it), Mixxx will refuse to start at all instead of falling back to the default skin. The only way to fix this is editing `mixxx.cfg` by hand or removing the directory. This fix adds an additional check if the `skin.xml` exists, and skips the skin if not. That allows Mixxx to fall back to the default skin.
Swiftb0y
approved these changes
Jun 1, 2021
|
nice. works and LGTM! |
|
@Holzhaus Some conflicts |
Just discard all changes from this fix, this was already fixed on |
Ah, the other issues are from the preview rescaling 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 is a small fix that is useful on it's own, but also improves
forward compatibility with the new QML skin system.
If you work on a QML skin and have it configured in the settings, then
switch to a 2.3-based branch, the skin obviously won't load. But if the
skin directory exists (e.g. because you have unstages files in it),
Mixxx will refuse to start at all instead of falling back to the default
skin. The only way to fix this is editing
mixxx.cfgby hand orremoving the directory.
This fix adds an additional check if the
skin.xmlexists, and skipsthe skin if not. That allows Mixxx to fall back to the default skin.