Merge pull request #4483 from daschuer/effects_refactoring_lp1948606

Effects refactoring: fix segfault
mixxxdj · Oct 25, 2021 · 8f1925a · 8f1925a
2 parents 30bdf83 + 351d9c8
commit 8f1925a
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/src/effects/chains/quickeffectchain.cpp b/src/effects/chains/quickeffectchain.cpp
@@ -49,7 +49,9 @@ EffectChainPresetPointer QuickEffectChain::presetAtIndex(int index) const {
 
 void QuickEffectChain::loadChainPreset(EffectChainPresetPointer pPreset) {
     EffectChain::loadChainPreset(pPreset);
-    setSuperParameter(pPreset->superKnob(), true);
+    if (pPreset) {
+        setSuperParameter(pPreset->superKnob(), true);
+    }
 }
 
 int QuickEffectChain::numPresets() const {

diff --git a/src/effects/effectchain.cpp b/src/effects/effectchain.cpp
@@ -197,10 +197,10 @@ const QString& EffectChain::presetName() const {
 }
 
 void EffectChain::loadChainPreset(EffectChainPresetPointer pPreset) {
+    slotControlClear(1);
     VERIFY_OR_DEBUG_ASSERT(pPreset) {
         return;
     }
-    slotControlClear(1);
 
     int effectSlotIndex = 0;
     for (const auto& pEffectPreset : pPreset->effectPresets()) {