Merge pull request #2234 from blind/music-edit-fix

Run key processing even when ctrl key is pressed
nesbox · Jul 15, 2023 · 47a779d · 47a779d
2 parents 48d8a58 + ab51789
commit 47a779d
Showing 1 changed file with 14 additions and 11 deletions.
diff --git a/src/studio/editors/music.c b/src/studio/editors/music.c
@@ -1442,6 +1442,9 @@ static void processPianoKeyboard(Music* music)
 {
     tic_mem* tic = music->tic;
 
+    if(tic_api_key(tic, tic_key_ctrl) || tic_api_key(tic, tic_key_alt))
+        return;
+
     if(keyWasPressed(music->studio, tic_key_up)) music->piano.edit.y--;
     else if(keyWasPressed(music->studio, tic_key_down)) music->piano.edit.y++;
     else if(keyWasPressed(music->studio, tic_key_left)) music->piano.edit.x--;
@@ -1547,18 +1550,18 @@ static void processKeyboard(Music* music)
                     : playFrame(music))
                 : stopTrack(music);
         }
+    }
 
-        switch (music->tab)
-        {
-        case MUSIC_TRACKER_TAB:
-            music->tracker.edit.y >= 0 
-                ? processTrackerKeyboard(music)
-                : processPatternKeyboard(music);
-            break;
-        case MUSIC_PIANO_TAB:
-            processPianoKeyboard(music);
-            break;
-        }
+    switch (music->tab)
+    {
+    case MUSIC_TRACKER_TAB:
+        music->tracker.edit.y >= 0 
+            ? processTrackerKeyboard(music)
+            : processPatternKeyboard(music);
+        break;
+    case MUSIC_PIANO_TAB:
+        processPianoKeyboard(music);
+        break;
     }
 }