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 #59176: crash on add/remove line breaks with mmrest #1997

Merged
merged 1 commit into from
May 9, 2015

Conversation

MarcSabatella
Copy link
Contributor

The crash was a simple null dereference error, but it pointed out a more fundametal issue with how this command deals with mmrests.

This PR treats mmrests as a single measure (which they are at some level) for the purpose of counting how many measures to put on a line. This much required only changing lastMeasure and nextMeasure to lastMeasureMM and nextMeasureMM respectively. However, adding a line break to an mmrest doesn't actually work. Apparently, everywhere else in the code where we add line breaks, we check for mmrests and add the break to the last real measure instead. So I do that here as well.

lasconic added a commit that referenced this pull request May 9, 2015
fix #59176: crash on add/remove line breaks with mmrest
@lasconic lasconic merged commit bd707bb into musescore:master May 9, 2015
@lasconic
Copy link
Contributor

lasconic commented May 9, 2015

I merged this one but then realised that a couple of mtests would be great. Could you do that?

@MarcSabatella
Copy link
Contributor Author

Yes, that would be good. Right now there are no tests for this function
because the code lives in ScoreView, because of the dialog box. I guess I
should re-factor it so just that initial bit is in ScoreView then the rest
happens in Score?

On Sat, May 9, 2015 at 3:04 AM, Nicolas Froment notifications@github.com
wrote:

I merged this one but then realised that a couple of mtests would be
great. Could you do that?


Reply to this email directly or view it on GitHub
#1997 (comment).

Marc Sabatella
marc@outsideshore.com

@lasconic
Copy link
Contributor

lasconic commented May 9, 2015

My guess too. That's how we do it for most of the other things.

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.

None yet

2 participants