Merge pull request #4899 from ronso0/effect-chain-select-after-save-a…

…s-new Effect chain: (re)load & select preset after saving with a new name
mixxxdj · Aug 21, 2022 · 593e0b1 · 593e0b1
2 parents 6aa07cd + 49e301e
commit 593e0b1
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 7 deletions.
diff --git a/src/effects/presets/effectchainpresetmanager.cpp b/src/effects/presets/effectchainpresetmanager.cpp
@@ -363,12 +363,14 @@ void EffectChainPresetManager::setQuickEffectPresetOrder(
     emit quickEffectChainPresetListUpdated();
 }
 
-void EffectChainPresetManager::savePreset(EffectChainPointer pChainSlot) {
+void EffectChainPresetManager::savePresetAndReload(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);
+    void savePresetAndReload(EffectChainPointer pChainSlot);
+    bool savePreset(EffectChainPresetPointer pPreset);
     void updatePreset(EffectChainPointer pChainSlot);
 
     EffectsXmlData readEffectsXml(const QDomDocument& doc, const QStringList& deckStrings);

diff --git a/src/widget/weffectchainpresetbutton.cpp b/src/widget/weffectchainpresetbutton.cpp
@@ -65,7 +65,7 @@ void WEffectChainPresetButton::populateMenu() {
         });
     }
     m_pMenu->addAction(tr("Save As New Preset..."), this, [this]() {
-        m_pChainPresetManager->savePreset(m_pChain);
+        m_pChainPresetManager->savePresetAndReload(m_pChain);
     });
 
     m_pMenu->addSeparator();