Skip to content

ControlObject/ControlPrivateDouble: Various Fixes#2918

Merged
Holzhaus merged 14 commits intomixxxdj:2.3from
uklotzde:controlobject
Jul 8, 2020
Merged

ControlObject/ControlPrivateDouble: Various Fixes#2918
Holzhaus merged 14 commits intomixxxdj:2.3from
uklotzde:controlobject

Conversation

@uklotzde
Copy link
Copy Markdown
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
@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
Comment thread src/control/control.cpp
Comment thread src/control/control.cpp Outdated
Comment thread src/control/control.cpp
Comment thread src/control/controlobject.cpp Outdated
@uklotzde
Copy link
Copy Markdown
Contributor Author

uklotzde commented Jul 6, 2020

All issues addressed.

Copy link
Copy Markdown
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!

Comment thread src/mixxx.cpp Outdated
@uklotzde
Copy link
Copy Markdown
Contributor Author

uklotzde commented Jul 7, 2020

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

Copy link
Copy Markdown
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.

Comment thread src/mixxx.cpp Outdated
@daschuer
Copy link
Copy Markdown
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.

Comment thread src/control/control.h
@uklotzde
Copy link
Copy Markdown
Contributor Author

uklotzde commented Jul 8, 2020

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

Copy link
Copy Markdown
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

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants