Skip to content

Commit 3339972

Browse files
committed
more robust removal of silent block inside note value blocks
1 parent e99387c commit 3339972

File tree

1 file changed

+9
-5
lines changed

1 file changed

+9
-5
lines changed

js/blocks.js

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -878,16 +878,20 @@ function Blocks () {
878878

879879
this.deleteNextDefault = function (thisBlock) {
880880
// Remove the Silence block from a Note block if another block
881-
// is inserted above the silence block.
881+
// is inserted anywhere above the silence block.
882882
var thisBlockobj = this.blockList[thisBlock];
883-
for (var i = 1; i < thisBlockobj.connections.length; i++) {
884-
if (thisBlockobj.connections[i] && this.blockList[thisBlockobj.connections[i]].name === 'rest2') {
885-
var silenceBlock = thisBlockobj.connections[i];
883+
while (last(thisBlockobj.connections) != null) {
884+
var lastc = thisBlockobj.connections.length - 1;
885+
var i = thisBlockobj.connections[lastc];
886+
if (this.blockList[i].name === 'rest2') {
887+
var silenceBlock = i; // thisBlockobj.connections[i];
886888
var silenceBlockobj = this.blockList[silenceBlock];
887889
silenceBlockobj.hide();
888890
silenceBlockobj.trash = true;
889-
this.blockList[thisBlock].connections[i] = silenceBlockobj.connections[1];
891+
thisBlockobj.connections[lastc] = silenceBlockobj.connections[1];
890892
break;
893+
} else {
894+
thisBlockobj = this.blockList[i];
891895
}
892896
}
893897
};

0 commit comments

Comments
 (0)