Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

lp1861431: Fix debug assertion for invalid crate names #2477

Merged
merged 2 commits into from Feb 2, 2020
Merged

lp1861431: Fix debug assertion for invalid crate names #2477

merged 2 commits into from Feb 2, 2020

Conversation

uklotzde
Copy link
Contributor

@uklotzde uklotzde commented Feb 1, 2020

https://bugs.launchpad.net/mixxx/+bug/1861431

  • Fixed debug assertion for existing, invalid crate names in the database, i.e. with leading/trailing whitespaces
  • Simplified the code for editing crate name (...won't fix the duplication)

Test: Manually add leading/trailing whitespaces to crate names in the database.

@uklotzde uklotzde added this to the 2.2.4 milestone Feb 1, 2020
@daschuer
Copy link
Member

daschuer commented Feb 1, 2020

This conflicts locally.
KONFLIKT (Inhalt): Merge-Konflikt in src/util/db/dbnamedentity.h
I have no idea why github is still satisfied.

Copy link
Member

@daschuer daschuer left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you. I have added some comments.

src/library/crate/cratefeature.cpp Show resolved Hide resolved

#include "util/db/dbentity.h"


inline QString parseEntityName(const QString& name) {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

i do not understand the function name. Can't we directly use trimmed()

...as requested. Although this introduces redudancy and is a step
in the wrong direction.
@uklotzde
Copy link
Contributor Author

uklotzde commented Feb 2, 2020

CI failures are unrelated

@daschuer
Copy link
Member

daschuer commented Feb 2, 2020

Thank you. LGTM.

@daschuer daschuer merged commit 3047062 into mixxxdj:2.2 Feb 2, 2020
@uklotzde uklotzde deleted the lp1861431_crate_names branch February 2, 2020 15:24
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants