Merge commit 'refs/pull/14/head' of github.com:Artefact2/libxm

Artefact2 · Apr 13, 2021 · 657662e · 657662e
2 parents a7e5888 + 7759aec
commit 657662e
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 5 deletions.
diff --git a/src/play.c b/src/play.c
@@ -410,18 +410,17 @@ static void xm_handle_note_and_instrument(xm_context_t* ctx, xm_channel_context_
 		if(HAS_TONE_PORTAMENTO(ch->current) && ch->instrument != NULL && ch->sample != NULL) {
 			/* Tone portamento in effect, unclear stuff happens */
 			xm_trigger_note(ctx, ch, XM_TRIGGER_KEEP_PERIOD | XM_TRIGGER_KEEP_SAMPLE_POSITION);
+		} else if(s->note == 0 && ch->sample != NULL) {
+			/* Ghost instrument, trigger note */
+			/* Sample position is kept, but envelopes are reset */
+			xm_trigger_note(ctx, ch, XM_TRIGGER_KEEP_SAMPLE_POSITION);
 		} else if(s->instrument > ctx->module.num_instruments) {
 			/* Invalid instrument, Cut current note */
 			xm_cut_note(ch);
 			ch->instrument = NULL;
 			ch->sample = NULL;
 		} else {
 			ch->instrument = ctx->module.instruments + (s->instrument - 1);
-			if(s->note == 0 && ch->sample != NULL) {
-				/* Ghost instrument, trigger note */
-				/* Sample position is kept, but envelopes are reset */
-				xm_trigger_note(ctx, ch, XM_TRIGGER_KEEP_SAMPLE_POSITION);
-			}
 		}
 	}
 

diff --git a/tests/ins-without-note1.xm b/tests/ins-without-note1.xm
diff --git a/tests/ins-without-note2.xm b/tests/ins-without-note2.xm
diff --git a/tests/ins-without-note3.xm b/tests/ins-without-note3.xm