From 49731800509fa17203a5903cf61ce76932b503b3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Sch=C3=BCrmann?= <daschuer@mixxx.org>
Date: Mon, 25 Oct 2021 01:32:57 +0200
Subject: [PATCH 1/2] Added missing null check in loadChainPreset()

---
 src/effects/chains/quickeffectchain.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/effects/chains/quickeffectchain.cpp b/src/effects/chains/quickeffectchain.cpp
index 21a3c239401..617080f968a 100644
--- 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 {

From 351d9c8abb49bb1680687c809cd1b5776ac571a2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Sch=C3=BCrmann?= <daschuer@mixxx.org>
Date: Mon, 25 Oct 2021 01:35:19 +0200
Subject: [PATCH 2/2] Clear effect chain when trying to load one that no longer
 exists

---
 src/effects/effectchain.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/effects/effectchain.cpp b/src/effects/effectchain.cpp
index 449b3496a11..17357fc1c32 100644
--- 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()) {