fixed bug with program not working if fm modulator still sounds but m…

…ain envelope has ended
LTVA1 · Feb 10, 2022 · 4027457 · 4027457
1 parent c1d42dd
commit 4027457
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/instrument_editor.png b/instrument_editor.png
diff --git a/src/main.c b/src/main.c
@@ -322,7 +322,9 @@ int main(int argc, char **argv)
 #ifdef DEBUG
 	Uint32 start_ticks = SDL_GetTicks();
 #endif
-
+
+	//debug("%d", mused.song.song_info[0]);
+
 	while (1)
 	{
 		SDL_Event e = { 0 };

diff --git a/src/view.c b/src/view.c
@@ -939,7 +939,7 @@ void program_view(GfxDomain *dest_surface, const SDL_Rect *dest, const SDL_Event
 		char box[6], cur = ' ';
 
 		for (int c = 0; c < CYD_MAX_CHANNELS; ++c)
-			if (mused.channel[c].instrument == inst && (mused.cyd.channel[c].flags & CYD_CHN_ENABLE_GATE) && (mused.channel[c].flags & MUS_CHN_PROGRAM_RUNNING) && mused.channel[c].program_tick == i) cur = '½';
+			if (mused.channel[c].instrument == inst && ((mused.cyd.channel[c].flags & CYD_CHN_ENABLE_GATE) || ((mused.cyd.channel[c].flags & CYD_CHN_ENABLE_FM) && (mused.cyd.channel[c].fm.adsr.envelope != 0) && !(mused.cyd.channel[c].flags & CYD_CHN_ENABLE_GATE))) && (mused.channel[c].flags & MUS_CHN_PROGRAM_RUNNING) && mused.channel[c].program_tick == i) cur = '½'; //where arrow pointing at current instrument program step is drawn
 
 		if (inst->program[i] == MUS_FX_NOP)
 		{