Effects(Preset)Mananger: improve pointer init/creation, add comments

Co-authored-by: Swiftb0y <12380386+Swiftb0y@users.noreply.github.com>
mixxxdj · Nov 17, 2023 · c5c8895 · c5c8895
1 parent c93e5d8
commit c5c8895
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/src/effects/effectsmanager.cpp b/src/effects/effectsmanager.cpp
@@ -318,10 +318,12 @@ void EffectsManager::saveEffectsXml() {
         standardEffectChainPresets.append(pPreset);
     }
 
-    auto outputChainPreset = m_outputEffectChain.data() != nullptr
-            ? EffectChainPresetPointer::create(m_outputEffectChain.data())
-            // required for tests
-            : EffectChainPresetPointer(new EffectChainPreset());
+    const auto outputChainPreset = m_outputEffectChain.isNull()
+            // required for tests when no output effect chain exists
+            ? EffectChainPresetPointer::create()
+            // no ownership concerns apply because we're just calling
+            // EffectChainPreset::EffectChainPreset(const EffectChain* chain)
+            : EffectChainPresetPointer::create(m_outputEffectChain.data());
 
     m_pChainPresetManager->saveEffectsXml(&doc,
             EffectsXmlData{

diff --git a/src/effects/presets/effectchainpresetmanager.cpp b/src/effects/presets/effectchainpresetmanager.cpp
@@ -715,7 +715,7 @@ EffectsXmlData EffectChainPresetManager::readEffectsXml(
     QDomElement mainEqElement = XmlParse::selectElement(root, EffectXml::kMainEq);
     QDomNodeList mainEqs = mainEqElement.elementsByTagName(EffectXml::kChain);
     QDomNode mainEqChainNode = mainEqs.at(0);
-    EffectChainPresetPointer mainEqPreset;
+    EffectChainPresetPointer mainEqPreset = nullptr;
     if (mainEqChainNode.isElement()) {
         QDomElement mainEqChainElement = mainEqChainNode.toElement();
         mainEqPreset = EffectChainPresetPointer(