Merge pull request #2202 from SynthstromAudible/cherry-pick-release/1.1-ab557a5aab31d874c16ace3a0147a9e211d5bf6c

Author: seangoodvibes

src/deluge/gui/views/instrument_clip_view.cpp

@@ -1534,7 +1534,7 @@ ActionResult InstrumentClipView::padAction(int32_t x, int32_t y, int32_t velocit
 		if (x == kDisplayWidth + 1) {
 
 			// "Learning" to this audition pad:
-			if (isUIModeActiveExclusively(UI_MODE_MIDI_LEARN)) {
+			if (isUIModeActiveExclusively(UI_MODE_MIDI_LEARN)) [[unlikely]] {
 				if (getCurrentUI() == this) {
 					if (sdRoutineLock) {
 						return ActionResult::REMIND_ME_OUTSIDE_CARD_ROUTINE;
@@ -1554,7 +1554,7 @@ ActionResult InstrumentClipView::padAction(int32_t x, int32_t y, int32_t velocit
 			}
 
 			// Changing the scale:
-			else if (isUIModeActiveExclusively(UI_MODE_SCALE_MODE_BUTTON_PRESSED)) {
+			else if (isUIModeActiveExclusively(UI_MODE_SCALE_MODE_BUTTON_PRESSED)) [[unlikely]] {
 				if (sdRoutineLock) {
 					return ActionResult::REMIND_ME_OUTSIDE_CARD_ROUTINE;
 				}
@@ -1571,6 +1571,25 @@ ActionResult InstrumentClipView::padAction(int32_t x, int32_t y, int32_t velocit
 					}
 				}
 			}
+			else if (currentUIMode == UI_MODE_HOLDING_SAVE_BUTTON && velocity) [[unlikely]] {
+				Instrument* instrument = getCurrentInstrument();
+
+				bool isKit = (instrument->type == OutputType::KIT);
+				if (isKit) {
+					// this is fine - since it's a kit we don't need the song, it's only used to check scale for
+					// instrument clips
+					NoteRow* noteRow =
+					    getCurrentInstrumentClip()->getNoteRowOnScreen(y, nullptr, nullptr); // On *current* clip!
+
+					if (noteRow && noteRow->drum && noteRow->drum->type == DrumType::SOUND) {
+						auto* drum = static_cast<SoundDrum*>(noteRow->drum);
+						currentUIMode = UI_MODE_NONE;
+						indicator_leds::setLedState(IndicatorLED::SAVE, false);
+						saveKitRowUI.setup(static_cast<SoundDrum*>(drum), &noteRow->paramManager);
+						openUI(&saveKitRowUI);
+					}
+				}
+			}
 
 			// Actual basic audition pad press:
 			else if (!velocity || isUIModeWithinRange(auditionPadActionUIModes)) {

src/deluge/model/clip/instrument_clip.cpp

@@ -964,6 +964,7 @@ ModelStackWithNoteRow* InstrumentClip::getNoteRowOnScreen(int32_t yDisplay, Mode
 	return modelStack->addNoteRow(noteRowId, noteRow);
 }
 
+/// can be called with null song if the clip is a kit
 NoteRow* InstrumentClip::getNoteRowOnScreen(int32_t yDisplay, Song* song, int32_t* getIndex) {
 	// Kit
 	if (output->type == OutputType::KIT) {