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

fix #308469: changing portaudio preferences does not work (3.x) #6523

Closed
wants to merge 1 commit into from

Conversation

SKefalidis
Copy link
Contributor

Resolves: https://musescore.org/en/node/308469
3.x version of: #6423

PortAudio does not work perfectly on my machine (options are missing), but I don't think that has to do with the preferences. The problem was that the preferences related to it were not added to the new system. I added them and fixed some bugs with combo boxes.

  • I signed CLA
  • I made sure the code in the PR follows the coding rules
  • I made sure the code compiles on my machine
  • I made sure there are no unnecessary changes in the code
  • I made sure the title of the PR reflects the core meaning of the issue you are solving
  • I made sure the commit message(s) contain a description and answer the question "Why do those changes fix that particular issue?" or "Why are those changes really necessary as improvements?"
  • I made sure the commit message title starts with "fix #424242:" if there is a related issue
  • [n\a] I created the test (mtest, vtest, script test) to verify the changes I made

@Jojo-Schmitz
Copy link
Contributor

rebase needed

PreferenceItem::apply(newValue);
_initialEditorIndex = _editorComboBox->currentIndex();
Copy link
Contributor

@Jojo-Schmitz Jojo-Schmitz Oct 5, 2020

Choose a reason for hiding this comment

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

this here is where the merge conflict happens and only due to an excess 'space' character

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I'll take care of it when I am back at my computer.

@Jojo-Schmitz
Copy link
Contributor

As #6621 has been merged, this here can get closed

@vpereverzev vpereverzev closed this Oct 5, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants