Fix bank switching behaviour bug

3 files changed, 20 insertions, 10 deletions

diff --git a/Makefile b/Makefile
index e867ed3..6b7ec3a 100644
--- a/Makefile
+++ b/Makefile
@@ -27,7 +27,7 @@ INC_FLAGS   := $(addprefix -I,$(INC_DIRS))
 INC_FLAGS   += -I$(LIBGBA_SRC)
 
 # Output library names and executables.
-TARGET         := STEPPER-v1.8-dev-05
+TARGET         := STEPPER-v1.8-dev-06
 ELF            := $(BUILD_DIR)/$(TARGET).elf
 BIN            := $(BUILD_DIR)/$(TARGET).gba
 
diff --git a/src/main.c b/src/main.c
index 2e64275..a6d02e1 100644
--- a/src/main.c
+++ b/src/main.c
@@ -13,13 +13,13 @@ WITH REGARD TO THIS SOFTWARE.
 //
 // High priority:
 //  + Higher resolution clock to allow for microtiming and more accurate tempo.
-//  - Look back again at the emulator issues...
+//  + Look back again at the emulator issues... (I give up)
+//  + Sync via MIDI with the Analogue cables.
+//  + Fix bank switching behaviour (bug)
 //  - Fix any bugs we currently have
-//      - Possible that when we switched banks there is some weird ui behaviour.
 //  - Add an envelope to ch3, would need to work with a timer in order to make
 //    it work I think.
 //  - Hold L/R retriggers at short intervals?
-//  - Sync via MIDI with the Analogue cables.
 //  - Channel params should show if there are some already on all triggers and
 //    modify only the selected parameter, not all of them.
 //  - Should scale mode be toggleable?
diff --git a/src/sequencer.c b/src/sequencer.c
index 56279bc..9f7f1ad 100644
--- a/src/sequencer.c
+++ b/src/sequencer.c
@@ -102,10 +102,6 @@ should_play(u8 prob) {
 
 void
 select_bank(int i) {
-    chain.current = 15;
-    chain.current = find_next_pattern();
-    current_pattern = 0;
-    next_pattern = 0;
     next_bank = i;
     clipboard.type = CLIP_EMPTY;
     if (settings.auto_save) {
@@ -117,6 +113,16 @@ select_bank(int i) {
     if (current_bank != i) {
         load_bank(i);
     }
+    chain.current = 15;
+    chain.current = find_next_pattern();
+    if (chain.len > 0 && chain.enabled) {
+        chain.playing = true;
+        next_pattern = chain.chain[chain.current];
+        current_pattern = next_pattern;
+    } else {
+        current_pattern = 0;
+        next_pattern = 0;
+    }
     current_bank = i;
     redraw_pattern_buttons = true;
     redraw_trigs = true;
@@ -129,13 +135,13 @@ void
 play_step(void) {
     static s8 pan[4] = {0};
     Pattern *pat = &patterns[current_pattern];
+    bool switch_bank = false;
     if (current_pattern != next_pattern && step_counter == 15) {
         current_pattern = next_pattern;
         redraw_pattern_buttons = true;
         update_bpm = true;
     } else if (current_bank != next_bank && step_counter == 15) {
-        select_bank(next_bank);
-        update_bpm = true;
+        switch_bank = true;
     } else if (chain.len != 0 && step_counter == 15 && chain.enabled) {
         redraw_pattern_buttons = true;
         update_bpm = true;
@@ -336,6 +342,10 @@ play_step(void) {
         bar_counter++;
     }
     step_counter = (step_counter + 1) % 16;
+    if (switch_bank) {
+        select_bank(next_bank);
+        update_bpm = true;
+    }
 }
 
 static int nseq_ticks = 0;