Effect chain: (re)load preset after saving with a new name

This will select the new preset in WEffectChainMenuButton and WEffectChainPresetSelector
mixxxdj · Aug 16, 2022 · 9615568 · 9615568
1 parent 1ed11fc
commit 9615568
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/src/effects/presets/effectchainpresetmanager.cpp b/src/effects/presets/effectchainpresetmanager.cpp
@@ -365,10 +365,12 @@ void EffectChainPresetManager::setQuickEffectPresetOrder(
 
 void EffectChainPresetManager::savePreset(EffectChainPointer pChainSlot) {
     auto pPreset = EffectChainPresetPointer::create(pChainSlot.data());
-    savePreset(pPreset);
+    if (savePreset(pPreset)) {
+        pChainSlot->loadChainPreset(pPreset);
+    }
 }
 
-void EffectChainPresetManager::savePreset(EffectChainPresetPointer pPreset) {
+bool EffectChainPresetManager::savePreset(EffectChainPresetPointer pPreset) {
     QString name;
     QString errorText;
     while (name.isEmpty() || m_effectChainPresets.contains(name)) {
@@ -381,7 +383,7 @@ void EffectChainPresetManager::savePreset(EffectChainPresetPointer pPreset) {
                 &okay)
                        .trimmed();
         if (!okay) {
-            return;
+            return false;
         }
 
         if (name.isEmpty()) {
@@ -404,6 +406,7 @@ void EffectChainPresetManager::savePreset(EffectChainPresetPointer pPreset) {
     emit quickEffectChainPresetListUpdated();
 
     savePresetXml(pPreset);
+    return true;
 }
 
 void EffectChainPresetManager::updatePreset(EffectChainPointer pChainSlot) {

diff --git a/src/effects/presets/effectchainpresetmanager.h b/src/effects/presets/effectchainpresetmanager.h
@@ -65,8 +65,8 @@ class EffectChainPresetManager : public QObject {
         return m_effectChainPresets.value(name);
     }
 
-    void savePreset(EffectChainPresetPointer pPreset);
     void savePreset(EffectChainPointer pChainSlot);
+    bool savePreset(EffectChainPresetPointer pPreset);
     void updatePreset(EffectChainPointer pChainSlot);
 
     EffectsXmlData readEffectsXml(const QDomDocument& doc, const QStringList& deckStrings);