fixed instrument reloading

Modrigue · Jan 8, 2024 · c9a9b7c · c9a9b7c
1 parent 8cdf3dd
commit c9a9b7c
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git a/js/scale_keyboard/instruments.js b/js/scale_keyboard/instruments.js
diff --git a/js/scale_keyboard/instruments.js.map b/js/scale_keyboard/instruments.js.map
diff --git a/ts/scale_keyboard/instruments.ts b/ts/scale_keyboard/instruments.ts
@@ -217,20 +217,21 @@ function onInstrumentSelected(selectorId: string)
     if (!instrLoaded)
         loadSelectedInstrument(selectorId);
     else
-        updateSelectedInstrument(instrumentLoadingId, selectorId);
+        updateSelectedInstrument(instrId, selectorId);
 }
 
 function updateSelectedInstrument(instrumentId: number, selectorId: string)
 {
     // update current instrument and volume
     const channelId = getChannelIdFromSelector(selectorId);
+    //console.log(channelId, instrumentId);
     MIDI.channels[channelId].program = instrumentId - 1;
     volumePlay = <number>instrumentsVolumesDict.get(instrumentId);
 
     // update generated song track instrument if existing
     for (let i = 1; i <= 2; i++)
     if (generatedMidi!= null && instrumentLoadingSelectorId == `song_generator_instrument_track${i}`)
-        generatedMidi.UpdateInstrument(i, instrumentLoadingId);
+        generatedMidi.UpdateInstrument(i, instrumentId);
 }
 
 function getChannelIdFromSelector(selectorId: string) : number