Merge pull request #68 from heuchi/18097_removing_keysig_crashes

fix: null pointer check in layout.cpp
This commit is contained in:
Nicolas Froment 2012-09-10 01:57:07 -07:00
commit a3d585daa2

View file

@ -919,7 +919,7 @@ qreal Score::cautionaryWidth(Measure* m)
}
Segment* s = m->findSegment(Segment::SegKeySigAnnounce, tick);
if (showCourtesy && !s)
if (showCourtesy && !s && ks)
wwMax = qMax(wwMax, ks->space().width());
else if (!showCourtesy && s && s->element(track))
wwMin = qMin(wwMin, -static_cast<KeySig*>(s->element(track))->space().width());