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.

Sign up for GitHub

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

Jump to bottom

ControlObject/ControlPrivateDouble: Various Fixes #2918

Merged
merged 14 commits into from
Jul 8, 2020
Merged

ControlObject/ControlPrivateDouble: Various Fixes #2918

merged 14 commits into from
Jul 8, 2020

Conversation

uklotzde
Copy link
Contributor

@uklotzde uklotzde commented Jul 5, 2020

Urgent fixes that are needed for #2911.

@uklotzde uklotzde requested a review from Holzhaus July 5, 2020 23:21
@Holzhaus Holzhaus mentioned this pull request Jul 5, 2020
Merged
7 tasks
@uklotzde uklotzde changed the base branch from master to 2.3 July 5, 2020 23:25
@uklotzde uklotzde added this to the 2.3.0 milestone Jul 5, 2020
daschuer
daschuer requested changes Jul 6, 2020
View reviewed changes
src/control/control.cpp Show resolved Hide resolved
src/control/control.cpp Outdated Show resolved Hide resolved
src/control/control.cpp Show resolved Hide resolved
src/control/controlobject.cpp Outdated Show resolved Hide resolved
@uklotzde
Copy link
Contributor Author

uklotzde commented Jul 6, 2020

All issues addressed.

Holzhaus
Holzhaus reviewed Jul 7, 2020
View reviewed changes
Copy link
Member

@Holzhaus Holzhaus left a comment

Choose a reason for hiding this comment

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

Thanks, looks good!

src/mixxx.cpp Outdated Show resolved Hide resolved
@uklotzde
Copy link
Contributor Author

uklotzde commented Jul 7, 2020

I have re-added the manual deletion of the (parented) SettingsManager, because the logs say so.

Holzhaus
Holzhaus approved these changes Jul 7, 2020
View reviewed changes
Copy link
Member

@Holzhaus Holzhaus left a comment

Choose a reason for hiding this comment

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

Works fine, no leaked controls anymore.

src/mixxx.cpp Outdated Show resolved Hide resolved
@daschuer
Copy link
Member

daschuer commented Jul 7, 2020

Thank you very much. Waiting for CI.

By the way, we have known issue with the m_pCreatorCO.
My idea was to fix it lock free #1713.

See my inline comment.

@uklotzde
Copy link
Contributor Author

uklotzde commented Jul 8, 2020

AppVeyor failed to set up the Ubuntu build envionment, unrelated.

Holzhaus
Holzhaus approved these changes Jul 8, 2020
View reviewed changes
Copy link
Member

@Holzhaus Holzhaus left a comment

Choose a reason for hiding this comment

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

LGTM.

@Holzhaus Holzhaus merged commit d967b0e into mixxxdj:2.3 Jul 8, 2020
@uklotzde uklotzde deleted the controlobject branch July 8, 2020 16:01
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@daschuer daschuer daschuer approved these changes

@Holzhaus Holzhaus Holzhaus approved these changes

Assignees
No one assigned
Labels
code quality
Projects
None yet
Milestone
2.3.0
Development

Successfully merging this pull request may close these issues.
3 participants
@uklotzde @daschuer @Holzhaus