Skip to content

Commit

Permalink
Merge pull request #5358 from MarcSabatella/295107-nav-crash
Browse files Browse the repository at this point in the history 
fix #295107: hang or crash on fingering mode after last note
  • Loading branch information
@anatoly-os
anatoly-os committed Oct 1, 2019
2 parents f479a71 + 68a3791 commit c236e88
Show file tree
Hide file tree
Showing 5 changed files with 148 additions and 6 deletions.
4 changes: 4 additions & 0 deletions libmscore/note.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2874,6 +2874,8 @@ Element* Note::nextInEl(Element* e)
if (e == _el.back())
return nullptr;
auto i = std::find(_el.begin(), _el.end(), e);
if (i == _el.end())
return nullptr;
return *(i+1);
}

Expand All @@ -2887,6 +2889,8 @@ Element* Note::prevInEl(Element* e)
if (e == _el.front())
return nullptr;
auto i = std::find(_el.begin(), _el.end(), e);
if (i == _el.end())
return nullptr;
return *(i-1);
}

Expand Down
5 changes: 5 additions & 0 deletions mscore/events.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -743,6 +743,11 @@ void ScoreView::keyPressEvent(QKeyEvent* ev)

if (!( (editData.modifiers & Qt::ShiftModifier) && (editData.key == Qt::Key_Backtab) )) {
if (editData.element->edit(editData)) {
if (state != ViewState::EDIT) {
// textTab or other function may have terminated edit mode
mscore->endCmd();
return;
}
if (editData.element->isTextBase())
mscore->textTools()->updateTools(editData);
else
Expand Down
17 changes: 11 additions & 6 deletions mscore/scoreview.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2432,7 +2432,7 @@ void ScoreView::textTab(bool back)
changeState(ViewState::NORMAL);

// find new note to add text to
bool here = false; // prevent infinite loop
bool here = false; // prevent infinite loop (relevant if navigation is allowed to wrap around end of score)
while (el) {
if (el->isNote()) {
Note* n = toNote(el);
Expand All @@ -2455,12 +2455,18 @@ void ScoreView::textTab(bool back)
}
// get prev/next note
score()->select(el);
el = back ? score()->prevElement() : score()->nextElement();
Element* el2 = back ? score()->prevElement() : score()->nextElement();
// start/end of score reached
if (el2 == el)
break;
el = el2;
}
if (!el || !el->isNote()) {
// nothing found, re-select original element and give up
score()->select(oe);
changeState(ViewState::EDIT);
// nothing found, exit cleanly
if (op->selectable())
score()->select(op);
else
score()->deselectAll();
return;
}
Note* nn = toNote(el);
Expand Down Expand Up @@ -2499,7 +2505,6 @@ void ScoreView::textTab(bool back)
if (el) {
// edit existing text
score()->select(el);
mscore->updateInspector(); // needed for Space with fingering
startEditMode(el);
}
else {
Expand Down
112 changes: 112 additions & 0 deletions mtest/testscript/scripts/#295107-last-finger-crash.mscx
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,112 @@
<?xml version="1.0" encoding="UTF-8"?>
<museScore version="3.01">
<Score>
<LayerTag id="0" tag="default"></LayerTag>
<currentLayer>0</currentLayer>
<Division>480</Division>
<Style>
<pageWidth>8.27</pageWidth>
<pageHeight>11.69</pageHeight>
<pagePrintableWidth>7.4826</pagePrintableWidth>
<lastSystemFillLimit>0</lastSystemFillLimit>
<Spatium>1.76389</Spatium>
</Style>
<showInvisible>1</showInvisible>
<showUnprintable>1</showUnprintable>
<showFrames>1</showFrames>
<showMargins>0</showMargins>
<metaTag name="arranger"></metaTag>
<metaTag name="composer"></metaTag>
<metaTag name="copyright"></metaTag>
<metaTag name="creationDate">2018-11-12</metaTag>
<metaTag name="lyricist"></metaTag>
<metaTag name="movementNumber"></metaTag>
<metaTag name="movementTitle"></metaTag>
<metaTag name="platform">Linux</metaTag>
<metaTag name="poet"></metaTag>
<metaTag name="source"></metaTag>
<metaTag name="translator"></metaTag>
<metaTag name="workNumber"></metaTag>
<metaTag name="workTitle">Treble</metaTag>
<Part>
<Staff id="1">
<StaffType group="pitched">
<name>stdNormal</name>
</StaffType>
</Staff>
<trackName>Piano</trackName>
<Instrument>
<longName>Piano</longName>
<shortName>Pno.</shortName>
<trackName>Piano</trackName>
<minPitchP>21</minPitchP>
<maxPitchP>108</maxPitchP>
<minPitchA>21</minPitchA>
<maxPitchA>108</maxPitchA>
<instrumentId>keyboard.piano</instrumentId>
<Articulation>
<velocity>100</velocity>
<gateTime>95</gateTime>
</Articulation>
<Articulation name="staccatissimo">
<velocity>100</velocity>
<gateTime>33</gateTime>
</Articulation>
<Articulation name="staccato">
<velocity>100</velocity>
<gateTime>50</gateTime>
</Articulation>
<Articulation name="portato">
<velocity>100</velocity>
<gateTime>67</gateTime>
</Articulation>
<Articulation name="tenuto">
<velocity>100</velocity>
<gateTime>100</gateTime>
</Articulation>
<Articulation name="marcato">
<velocity>120</velocity>
<gateTime>67</gateTime>
</Articulation>
<Articulation name="sforzato">
<velocity>120</velocity>
<gateTime>100</gateTime>
</Articulation>
<Channel>
<program value="0"/>
</Channel>
</Instrument>
</Part>
<Staff id="1">
<VBox>
<height>10</height>
<Text>
<style>Title</style>
<text>Treble</text>
</Text>
</VBox>
<Measure>
<voice>
<Chord>
<durationType>half</durationType>
<Note>
<Fingering>
<style>String Number</style>
<text>3</text>
</Fingering>
<pitch>72</pitch>
<tpc>14</tpc>
</Note>
</Chord>
<Chord>
<durationType>half</durationType>
<Note>
<pitch>71</pitch>
<tpc>19</tpc>
</Note>
</Chord>
</voice>
</Measure>
</Staff>
</Score>
</museScore>
16 changes: 16 additions & 0 deletions mtest/testscript/scripts/#295107-last-finger-crash.script
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
init init/Treble.mscx
cmd select-all
cmd time-delete
cmd append-measure
cmd note-input
cmd pad-note-2
cmd note-c
cmd note-c
cmd escape
cmd prev-chord
palette Fingering style String&#032Number text 3
cmd edit-element
cmd next-element
cmd next-element
cmd pitch-down
test score #295107-last-finger-crash.mscx

0 comments on commit c236e88

Please sign in to comment.