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

Fixed LMMS crash when pressing Q in not existing piano roll. #3609

Merged
merged 3 commits into from Jun 7, 2017

Conversation

Projects
6 participants
@karmux
Contributor

karmux commented Jun 4, 2017

Steps to reproduce:

  1. Open LMMS
  2. Open Piano-Roll
  3. Click on Q
  4. LMMS crashes.

This change fixes it.
Link to issue: #3608.

@Umcaruje Umcaruje added this to the 1.2.0 milestone Jun 6, 2017

@Umcaruje Umcaruje added this to In Progress in Release 1.2.0 RC4 Jun 6, 2017

@@ -805,7 +805,7 @@ void PianoRoll::setBackgroundShade( const QColor & c )
void PianoRoll::drawNoteRect( QPainter & p, int x, int y,
void PianoRoll::drawNoteRect( QPainter & p, int x, int y,
int width, const Note * n, const QColor & noteCol,

This comment has been minimized.

@zonkmachine

zonkmachine Jun 7, 2017

Member

You have one requested fix in here together with 14 lines that are formatting changes like whitespace at the end etc. This makes it a bit hard to review. I suggest for the next time to commit changes like this separately and name the commit 'fixup' or 'whitespace' or something similar.

@zonkmachine

zonkmachine Jun 7, 2017

Member

You have one requested fix in here together with 14 lines that are formatting changes like whitespace at the end etc. This makes it a bit hard to review. I suggest for the next time to commit changes like this separately and name the commit 'fixup' or 'whitespace' or something similar.

This comment has been minimized.

@tresf

tresf Jun 7, 2017

Member

@zonkmachine agreed. Harder to cherry-pick too as the more lines that get modified increases the chances of a merge conflict.

@tresf

tresf Jun 7, 2017

Member

@zonkmachine agreed. Harder to cherry-pick too as the more lines that get modified increases the chances of a merge conflict.

This comment has been minimized.

@karmux

karmux Jun 7, 2017

Contributor

I need to switch off editor's automatic cleanups :)

@karmux

karmux Jun 7, 2017

Contributor

I need to switch off editor's automatic cleanups :)

@zonkmachine

Tested, works!
This PR has now been updated to conform with @michaelgregorius suggested changes. I suggest merge if there are no other concerns.

@zonkmachine zonkmachine merged commit 5678981 into LMMS:stable-1.2 Jun 7, 2017

1 check passed

continuous-integration/travis-ci/pr The Travis CI build passed
Details

@zonkmachine zonkmachine moved this from In Progress to Done in Release 1.2.0 RC4 Jun 7, 2017

@tresf

This comment has been minimized.

Show comment
Hide comment
@tresf

tresf Jun 8, 2017

Member

FYI, this commit is all ready to merge to master in liushuyu/merge.

Member

tresf commented Jun 8, 2017

FYI, this commit is all ready to merge to master in liushuyu/merge.

@grejppi

This is merely a cosmetic thing

NoteVector notes = getSelectedNotes();
if (notes.empty())
if( notes.empty() )

This comment has been minimized.

@grejppi

grejppi Jul 2, 2017

Contributor

This is a new function, and therefore the old coding style (wrt spaces inside parentheses) should not apply. I realize this is late, but still 😅

@grejppi

grejppi Jul 2, 2017

Contributor

This is a new function, and therefore the old coding style (wrt spaces inside parentheses) should not apply. I realize this is late, but still 😅

PhysSong added a commit to PhysSong/lmms that referenced this pull request Jul 8, 2017

PhysSong added a commit to PhysSong/lmms that referenced this pull request Jul 8, 2017

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment