setup dx7 when dx oscillator selected (#3004)

SynthstromAudible · Dec 3, 2024 · c4e8c9f · c4e8c9f
1 parent 7c3491f
commit c4e8c9f
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/src/deluge/gui/menu_item/osc/type.h b/src/deluge/gui/menu_item/osc/type.h
@@ -34,7 +34,7 @@ class Type final : public Selection, public FormattedTitle {
 	Type(l10n::String name, l10n::String title_format_str) : Selection(name), FormattedTitle(title_format_str){};
 	void beginSession(MenuItem* navigatedBackwardFrom) override { Selection::beginSession(navigatedBackwardFrom); }
 
-	bool mayUseDx() { return soundEditor.currentSource->dxPatch != nullptr; }
+	bool mayUseDx() { return !soundEditor.editingKit(); }
 
 	void readCurrentValue() override {
 		int32_t rawVal = (int32_t)soundEditor.currentSource->oscType;
@@ -67,6 +67,7 @@ class Type final : public Selection, public FormattedTitle {
 		}
 
 		soundEditor.currentSource->setOscType(newValue);
+
 		if (oldValue == OscType::SQUARE || newValue == OscType::SQUARE) {
 			soundEditor.currentSound->setupPatchingForAllParamManagers(currentSong);
 		}

diff --git a/src/deluge/processing/source.cpp b/src/deluge/processing/source.cpp
@@ -284,6 +284,9 @@ void Source::setOscType(OscType newType) {
 	}
 
 	oscType = newType;
+	if (oscType == OscType::DX7) {
+		ensureDxPatch();
+	}
 }
 
 DxPatch* Source::ensureDxPatch() {