Crash-fix for moving sample loops while tuning-tone is on

8bitbubsy · 8bitbubsy · commit 71cf448c68ee · 2025-04-27T21:40:23.000+02:00
diff --git a/src/pt2_replayer.c b/src/pt2_replayer.c
@@ -50,16 +50,16 @@ double ciaBpm2Hz(int32_t bpm)
 
 void updatePaulaLoops(void) // used after manipulating sample loop points while Paula is live
 {
+	moduleSample_t *s = &song->samples[editor.currSample];
+
 	const bool audioWasntLocked = !audio.locked;
 	if (audioWasntLocked)
 		lockAudio();
 
-	moduleSample_t *s = &song->samples[editor.currSample];
-
 	moduleChannel_t *ch = song->channels;
 	for (uint32_t i = 0; i < PAULA_VOICES; i++, ch++)
 	{
-		if (ch->n_samplenum == editor.currSample) // selected sample matches channel's sample?
+		if (ch->n_samplenum == editor.currSample && ch->n_start != NULL)
 		{
 			const uint32_t voiceAddr = 0xDFF0A0 + (i * 16);
 

Original file line number	Diff line number	Diff line change
`@@ -50,16 +50,16 @@ double ciaBpm2Hz(int32_t bpm)`
`50`	`50`
`51`	`51`	`void updatePaulaLoops(void) // used after manipulating sample loop points while Paula is live`
`52`	`52`	`{`
	`53`	`+ moduleSample_t *s = &song->samples[editor.currSample];`
	`54`	`+`
`53`	`55`	`const bool audioWasntLocked = !audio.locked;`
`54`	`56`	`if (audioWasntLocked)`
`55`	`57`	`lockAudio();`
`56`	`58`
`57`		`- moduleSample_t *s = &song->samples[editor.currSample];`
`58`		`-`
`59`	`59`	`moduleChannel_t *ch = song->channels;`
`60`	`60`	`for (uint32_t i = 0; i < PAULA_VOICES; i++, ch++)`
`61`	`61`	`{`
`62`		`- if (ch->n_samplenum == editor.currSample) // selected sample matches channel's sample?`
	`62`	`+ if (ch->n_samplenum == editor.currSample && ch->n_start != NULL)`
`63`	`63`	`{`
`64`	`64`	`const uint32_t voiceAddr = 0xDFF0A0 + (i * 16);`
`65`	`65`