Do not fail to parse a multi-bar config #1157
Merged
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
|
I don't want to hold up this fix being merged but it'd be great to have a test here to prevent regressions in the future. |
|
I wonder if there is a test suite? Looking everywhere I can find only that Waybar is built, but not tested. |
ghost
commented
Jul 11, 2021
| } | ||
| } else { | ||
| spdlog::error("Cannot merge config, conflicting or invalid JSON types"); |
There was a problem hiding this comment.
Maybe I should overwrite A with B here, because B is the config which called the include and A the configs included so far?
There was a problem hiding this comment.
Keep the error, and if it's happened let's overwrite A with B
|
Thanks for the fix! |
ghost
deleted the
ghost
mentioned this pull request
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.
Fixes #1152.